diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f62d8a4..b650fbe 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -45,19 +45,19 @@ jobs: - name: Build run: | - bazel build --config=windows //cdc_rsync //asset_stream_manager //tests_common //tests_asset_streaming_30 //tests_cdc_rsync + bazel build --config=windows //cdc_rsync //cdc_stream //tests_common //tests_cdc_stream //tests_cdc_rsync - name: Test run: | bazel-bin\tests_common\tests_common.exe - bazel-bin\tests_asset_streaming_30\tests_asset_streaming_30.exe + bazel-bin\tests_cdc_stream\tests_cdc_stream.exe bazel-bin\tests_cdc_rsync\tests_cdc_rsync.exe bazel test --config=windows --test_output=errors --local_test_jobs=1 ` - //asset_stream_manager/... ` //cdc_fuse_fs/... ` //cdc_rsync/... ` //cdc_rsync/base/... ` //cdc_rsync_server/... ` + //cdc_stream/... ` //common/... ` //data_store/... ` //fastcdc/... ` diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 4d75d54..b1148f7 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -53,19 +53,19 @@ jobs: - name: Build run: | bazel build --config=windows --compilation_mode=opt --copt=/GL ` - //cdc_rsync //asset_stream_manager //tests_common //tests_asset_streaming_30 //tests_cdc_rsync + //cdc_rsync //cdc_stream //tests_common //tests_cdc_stream //tests_cdc_rsync - name: Test run: | bazel-bin\tests_common\tests_common.exe - bazel-bin\tests_asset_streaming_30\tests_asset_streaming_30.exe + bazel-bin\tests_cdc_stream\tests_cdc_stream.exe bazel-bin\tests_cdc_rsync\tests_cdc_rsync.exe bazel test --config=windows --compilation_mode=opt --copt=/GL --test_output=errors --local_test_jobs=1 ` - //asset_stream_manager/... ` //cdc_fuse_fs/... ` //cdc_rsync/... ` //cdc_rsync/base/... ` //cdc_rsync_server/... ` + //cdc_stream/... ` //common/... ` //data_store/... ` //fastcdc/... ` @@ -77,7 +77,7 @@ jobs: run: | mkdir artifacts cp bazel-bin/cdc_rsync/cdc_rsync.exe artifacts - cp bazel-bin/asset_stream_manager/asset_stream_manager.exe artifacts + cp bazel-bin/cdc_stream/cdc_stream.exe artifacts cp LICENSE artifacts cp README.md artifacts @@ -91,9 +91,6 @@ jobs: runs-on: ubuntu-latest needs: [Build-And-Test-Windows, Build-And-Test-Linux] steps: - - name: Test - run: echo '${{ toJSON(github) }}' - - name: Download artifacts uses: actions/download-artifact@v3 diff --git a/README.md b/README.md index 3f07af4..6e892a4 100644 --- a/README.md +++ b/README.md @@ -143,10 +143,10 @@ The two tools can be built and used independently. ``` * Build Windows components ``` - bazel build --config windows --compilation_mode=opt --copt=/GL //asset_stream_manager + bazel build --config windows --compilation_mode=opt --copt=/GL //cdc_stream ``` * Copy the Linux build output files `cdc_fuse_fs` and `libfuse.so` from - `bazel-bin/cdc_fuse_fs` on the Linux system to `bazel-bin\asset_stream_manager` + `bazel-bin/cdc_fuse_fs` on the Linux system to `bazel-bin\cdc_stream` on the Windows machine. ## Usage @@ -211,13 +211,13 @@ cdc_rsync C:\path\to\assets\* user@linux.device.com:~/assets -vr ### CDC Stream -`cdc_stream` consists of a background service called `asset_stream_manager`, -which has to be started in advance with +`cdc_stream` consists of a background service, which has to be started in +advance with ``` -asset_stream_manager +cdc_stream start-service ``` The service logs to `%APPDATA%\cdc-file-transfer\logs` by default. Try -`asset_stream_manager --helpfull` to get a list of available flags. +`cdc_stream --help` to get a list of available flags. To stream the Windows directory `C:\path\to\assets` to `~/assets` on the Linux device, run @@ -235,17 +235,14 @@ cdc_stream stop user@linux.device.com:~/assets ## Troubleshooting -`cdc_rsync` always logs to the console. By default, the `asset_stream_manager` -service logs to a timestamped file in `%APPDATA%\cdc-file-transfer\logs`. It can -be switched to log to console by starting it with `--log_to_stdout`: +`cdc_rsync` always logs to the console. By default, the `cdc_stream` service +logs to a timestamped file in `%APPDATA%\cdc-file-transfer\logs`. It can be +switched to log to console by starting it with `--log-to-stdout`: ``` -asset_stream_manager --log_to_stdout +cdc_stream start-service --log_to_stdout ``` -Both `cdc_rsync` and `asset_stream_manager` support command line flags to control log +Both `cdc_rsync` and `cdc_stream` support command line flags to control log verbosity. Passing `-vvv` prints debug logs, `-vvvv` prints verbose logs. The debug logs contain all SSH and SCP commands that are attempted to run, which is very useful for troubleshooting. - -`cdc_stream` is just a thin client for the asset streaming service. Nothing ever -goes wrong with it [citation needed]. diff --git a/all_files.vcxitems b/all_files.vcxitems index 3b5223b..1fac1d7 100644 --- a/all_files.vcxitems +++ b/all_files.vcxitems @@ -15,26 +15,26 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -145,24 +145,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -244,7 +244,7 @@ - + @@ -268,7 +268,7 @@ - + diff --git a/asset_stream_manager/.gitignore b/cdc_stream/.gitignore similarity index 100% rename from asset_stream_manager/.gitignore rename to cdc_stream/.gitignore diff --git a/asset_stream_manager/BUILD b/cdc_stream/BUILD similarity index 99% rename from asset_stream_manager/BUILD rename to cdc_stream/BUILD index bc9c295..92fe9ba 100644 --- a/asset_stream_manager/BUILD +++ b/cdc_stream/BUILD @@ -5,7 +5,7 @@ package(default_visibility = [ ]) cc_binary( - name = "asset_stream_manager", + name = "cdc_stream", srcs = ["main.cc"], data = [":roots_pem"], deps = [ diff --git a/asset_stream_manager/asset_stream_config.cc b/cdc_stream/asset_stream_config.cc similarity index 99% rename from asset_stream_manager/asset_stream_config.cc rename to cdc_stream/asset_stream_config.cc index 3162713..6f66174 100644 --- a/asset_stream_manager/asset_stream_config.cc +++ b/cdc_stream/asset_stream_config.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/asset_stream_config.h" +#include "cdc_stream/asset_stream_config.h" #include #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include "absl_helper/jedec_size_flag.h" -#include "asset_stream_manager/base_command.h" +#include "cdc_stream/base_command.h" #include "common/buffer.h" #include "common/path.h" #include "common/status_macros.h" diff --git a/asset_stream_manager/asset_stream_config.h b/cdc_stream/asset_stream_config.h similarity index 94% rename from asset_stream_manager/asset_stream_config.h rename to cdc_stream/asset_stream_config.h index b240e51..83cda5d 100644 --- a/asset_stream_manager/asset_stream_config.h +++ b/cdc_stream/asset_stream_config.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_ASSET_STREAM_CONFIG_H_ -#define ASSET_STREAM_MANAGER_ASSET_STREAM_CONFIG_H_ +#ifndef CDC_STREAM_ASSET_STREAM_CONFIG_H_ +#define CDC_STREAM_SET_STREAM_CONFIG_H_ #include #include #include #include "absl/status/status.h" -#include "asset_stream_manager/session_config.h" +#include "cdc_stream/session_config.h" #include "session.h" namespace lyra { @@ -108,4 +108,4 @@ class AssetStreamConfig { }; // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_ASSET_STREAM_CONFIG_H_ +#endif // CDC_STREAM_SET_STREAM_CONFIG_H_ diff --git a/asset_stream_manager/asset_stream_server.cc b/cdc_stream/asset_stream_server.cc similarity index 89% rename from asset_stream_manager/asset_stream_server.cc rename to cdc_stream/asset_stream_server.cc index 1aba143..a4bafdd 100644 --- a/asset_stream_manager/asset_stream_server.cc +++ b/cdc_stream/asset_stream_server.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/asset_stream_server.h" +#include "cdc_stream/asset_stream_server.h" -#include "asset_stream_manager/grpc_asset_stream_server.h" -#include "asset_stream_manager/testing_asset_stream_server.h" +#include "cdc_stream/grpc_asset_stream_server.h" +#include "cdc_stream/testing_asset_stream_server.h" namespace cdc_ft { diff --git a/asset_stream_manager/asset_stream_server.h b/cdc_stream/asset_stream_server.h similarity index 95% rename from asset_stream_manager/asset_stream_server.h rename to cdc_stream/asset_stream_server.h index 32c651a..064a7b8 100644 --- a/asset_stream_manager/asset_stream_server.h +++ b/cdc_stream/asset_stream_server.h @@ -14,8 +14,9 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_ASSET_STREAM_SERVER_H_ -#define ASSET_STREAM_MANAGER_ASSET_STREAM_SERVER_H_ +#ifndef CDC_STREAM_ASSET_STREAM_SERVER_H_ +#define CDC_STREAM_ASSET_STREAM_SERVER_H_ + #include #include @@ -93,4 +94,4 @@ class AssetStreamServer { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_ASSET_STREAM_SERVER_H_ +#endif // CDC_STREAM_ASSET_STREAM_SERVER_H_ diff --git a/asset_stream_manager/background_service_impl.cc b/cdc_stream/background_service_impl.cc similarity index 97% rename from asset_stream_manager/background_service_impl.cc rename to cdc_stream/background_service_impl.cc index 2099baa..b7af911 100644 --- a/asset_stream_manager/background_service_impl.cc +++ b/cdc_stream/background_service_impl.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/background_service_impl.h" +#include "cdc_stream/background_service_impl.h" #include "common/grpc_status.h" #include "common/log.h" diff --git a/asset_stream_manager/background_service_impl.h b/cdc_stream/background_service_impl.h similarity index 75% rename from asset_stream_manager/background_service_impl.h rename to cdc_stream/background_service_impl.h index 05b31a6..7b13866 100644 --- a/asset_stream_manager/background_service_impl.h +++ b/cdc_stream/background_service_impl.h @@ -14,23 +14,18 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_BACKGROUND_SERVICE_IMPL_H_ -#define ASSET_STREAM_MANAGER_BACKGROUND_SERVICE_IMPL_H_ +#ifndef CDC_STREAM_BACKGROUND_SERVICE_IMPL_H_ +#define CDC_STREAM_BACKGROUND_SERVICE_IMPL_H_ #include "absl/status/status.h" -#include "asset_stream_manager/background_service_impl.h" -#include "asset_stream_manager/session_management_server.h" +#include "cdc_stream/background_service_impl.h" +#include "cdc_stream/session_management_server.h" #include "grpcpp/grpcpp.h" #include "proto/background_service.grpc.pb.h" namespace cdc_ft { // Implements a service to manage a background process as a server. -// The corresponding client is implemented by ProcessManager. The background -// process in this case is asset_stream_manager. ProcessManager starts the -// process on demand (e.g. when `ggp instance mount --local-dir` is invoked) and -// manages its lifetime: It calls GetPid() initially, HealthCheck() periodically -// to monitor the process, and Exit() on shutdown. // This service is owned by SessionManagementServer. class BackgroundServiceImpl final : public backgroundservice::BackgroundService::Service { @@ -65,4 +60,4 @@ class BackgroundServiceImpl final } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_BACKGROUND_SERVICE_IMPL_H_ +#endif // CDC_STREAM_BACKGROUND_SERVICE_IMPL_H_ diff --git a/asset_stream_manager/base_command.cc b/cdc_stream/base_command.cc similarity index 98% rename from asset_stream_manager/base_command.cc rename to cdc_stream/base_command.cc index eaaf7ee..31808c8 100644 --- a/asset_stream_manager/base_command.cc +++ b/cdc_stream/base_command.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/base_command.h" +#include "cdc_stream/base_command.h" #include "absl/strings/str_format.h" #include "absl_helper/jedec_size_flag.h" diff --git a/asset_stream_manager/base_command.h b/cdc_stream/base_command.h similarity index 95% rename from asset_stream_manager/base_command.h rename to cdc_stream/base_command.h index 664448e..65118cd 100644 --- a/asset_stream_manager/base_command.h +++ b/cdc_stream/base_command.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_BASE_COMMAND_H_ -#define ASSET_STREAM_MANAGER_BASE_COMMAND_H_ +#ifndef CDC_STREAM_BASE_COMMAND_H_ +#define CDC_STREAM_BASE_COMMAND_H_ #include @@ -89,4 +89,4 @@ class BaseCommand { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_BASE_COMMAND_H_ +#endif // CDC_STREAM_BASE_COMMAND_H_ diff --git a/asset_stream_manager/cdc_fuse_manager.cc b/cdc_stream/cdc_fuse_manager.cc similarity index 99% rename from asset_stream_manager/cdc_fuse_manager.cc rename to cdc_stream/cdc_fuse_manager.cc index 29c9ba0..163285c 100644 --- a/asset_stream_manager/cdc_fuse_manager.cc +++ b/cdc_stream/cdc_fuse_manager.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/cdc_fuse_manager.h" +#include "cdc_stream/cdc_fuse_manager.h" #include "absl/strings/match.h" #include "absl/strings/str_format.h" diff --git a/asset_stream_manager/cdc_fuse_manager.h b/cdc_stream/cdc_fuse_manager.h similarity index 96% rename from asset_stream_manager/cdc_fuse_manager.h rename to cdc_stream/cdc_fuse_manager.h index 26be602..2b172f6 100644 --- a/asset_stream_manager/cdc_fuse_manager.h +++ b/cdc_stream/cdc_fuse_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_CDC_FUSE_MANAGER_H_ -#define ASSET_STREAM_MANAGER_CDC_FUSE_MANAGER_H_ +#ifndef CDC_STREAM_CDC_FUSE_MANAGER_H_ +#define CDC_STREAM_CDC_FUSE_MANAGER_H_ #include "absl/status/status.h" #include "common/remote_util.h" @@ -96,4 +96,4 @@ class CdcFuseManager { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_CDC_FUSE_MANAGER_H_ +#endif // CDC_STREAM_CDC_FUSE_MANAGER_H_ diff --git a/asset_stream_manager/asset_stream_manager.vcxproj b/cdc_stream/cdc_stream.vcxproj similarity index 95% rename from asset_stream_manager/asset_stream_manager.vcxproj rename to cdc_stream/cdc_stream.vcxproj index 141ff00..4da2203 100644 --- a/asset_stream_manager/asset_stream_manager.vcxproj +++ b/cdc_stream/cdc_stream.vcxproj @@ -42,12 +42,12 @@ - $(SolutionDir)bazel-out\x64_windows-dbg\bin\asset_stream_manager\ + $(SolutionDir)bazel-out\x64_windows-dbg\bin\cdc_stream\ UNICODE /std:c++17 - $(SolutionDir)bazel-out\x64_windows-opt\bin\asset_stream_manager\ + $(SolutionDir)bazel-out\x64_windows-opt\bin\asset_stcdc_streamream_manager\ UNICODE /std:c++17 @@ -66,8 +66,8 @@ - //asset_stream_manager - asset_stream_manager.exe + //cdc_stream + cdc_stream.exe ..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;..\bazel-cdc-file-transfer\external\com_github_lyra\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) diff --git a/asset_stream_manager/asset_stream_manager.vcxproj.filters b/cdc_stream/cdc_stream.vcxproj.filters similarity index 100% rename from asset_stream_manager/asset_stream_manager.vcxproj.filters rename to cdc_stream/cdc_stream.vcxproj.filters diff --git a/asset_stream_manager/grpc_asset_stream_server.cc b/cdc_stream/grpc_asset_stream_server.cc similarity index 99% rename from asset_stream_manager/grpc_asset_stream_server.cc rename to cdc_stream/grpc_asset_stream_server.cc index a2399e0..c291217 100644 --- a/asset_stream_manager/grpc_asset_stream_server.cc +++ b/cdc_stream/grpc_asset_stream_server.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/grpc_asset_stream_server.h" +#include "cdc_stream/grpc_asset_stream_server.h" #include "absl/strings/str_format.h" #include "absl/time/time.h" diff --git a/asset_stream_manager/grpc_asset_stream_server.h b/cdc_stream/grpc_asset_stream_server.h similarity index 89% rename from asset_stream_manager/grpc_asset_stream_server.h rename to cdc_stream/grpc_asset_stream_server.h index aa9bc1f..1adc07b 100644 --- a/asset_stream_manager/grpc_asset_stream_server.h +++ b/cdc_stream/grpc_asset_stream_server.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_GRPC_ASSET_STREAM_SERVER_H_ -#define ASSET_STREAM_MANAGER_GRPC_ASSET_STREAM_SERVER_H_ +#ifndef CDC_STREAM_GRPC_ASSET_STREAM_SERVER_H_ +#define CDC_STREAM_GRPC_ASSET_STREAM_SERVER_H_ #include #include -#include "asset_stream_manager/asset_stream_server.h" +#include "cdc_stream/asset_stream_server.h" #include "common/thread_safe_map.h" namespace grpc { @@ -67,4 +67,4 @@ class GrpcAssetStreamServer : public AssetStreamServer { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_GRPC_ASSET_STREAM_SERVER_H_ +#endif // CDC_STREAM_GRPC_ASSET_STREAM_SERVER_H_ diff --git a/asset_stream_manager/local_assets_stream_manager_client.cc b/cdc_stream/local_assets_stream_manager_client.cc similarity index 98% rename from asset_stream_manager/local_assets_stream_manager_client.cc rename to cdc_stream/local_assets_stream_manager_client.cc index 5503ea1..3543d16 100644 --- a/asset_stream_manager/local_assets_stream_manager_client.cc +++ b/cdc_stream/local_assets_stream_manager_client.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/local_assets_stream_manager_client.h" +#include "cdc_stream/local_assets_stream_manager_client.h" #include diff --git a/asset_stream_manager/local_assets_stream_manager_client.h b/cdc_stream/local_assets_stream_manager_client.h similarity index 93% rename from asset_stream_manager/local_assets_stream_manager_client.h rename to cdc_stream/local_assets_stream_manager_client.h index cd535ca..a031bb9 100644 --- a/asset_stream_manager/local_assets_stream_manager_client.h +++ b/cdc_stream/local_assets_stream_manager_client.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ -#define ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ +#ifndef CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ +#define CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ #include @@ -74,4 +74,4 @@ class LocalAssetsStreamManagerClient { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ +#endif // CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_CLIENT_H_ diff --git a/asset_stream_manager/local_assets_stream_manager_service_impl.cc b/cdc_stream/local_assets_stream_manager_service_impl.cc similarity index 98% rename from asset_stream_manager/local_assets_stream_manager_service_impl.cc rename to cdc_stream/local_assets_stream_manager_service_impl.cc index 7f62507..0085ab9 100644 --- a/asset_stream_manager/local_assets_stream_manager_service_impl.cc +++ b/cdc_stream/local_assets_stream_manager_service_impl.cc @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/local_assets_stream_manager_service_impl.h" +#include "cdc_stream/local_assets_stream_manager_service_impl.h" #include #include "absl/strings/str_format.h" #include "absl/strings/str_replace.h" #include "absl/strings/str_split.h" -#include "asset_stream_manager/multi_session.h" -#include "asset_stream_manager/session_manager.h" +#include "cdc_stream/multi_session.h" +#include "cdc_stream/session_manager.h" #include "common/grpc_status.h" #include "common/log.h" #include "common/path.h" diff --git a/asset_stream_manager/local_assets_stream_manager_service_impl.h b/cdc_stream/local_assets_stream_manager_service_impl.h similarity index 93% rename from asset_stream_manager/local_assets_stream_manager_service_impl.h rename to cdc_stream/local_assets_stream_manager_service_impl.h index e22726b..96a3aa9 100644 --- a/asset_stream_manager/local_assets_stream_manager_service_impl.h +++ b/cdc_stream/local_assets_stream_manager_service_impl.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ -#define ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ +#ifndef CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ +#define CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "asset_stream_manager/session.h" -#include "asset_stream_manager/session_config.h" +#include "cdc_stream/session.h" +#include "cdc_stream/session_config.h" #include "metrics/metrics.h" #include "proto/local_assets_stream_manager.grpc.pb.h" @@ -107,4 +107,4 @@ class LocalAssetsStreamManagerServiceImpl final } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ +#endif // CDC_STREAM_LOCAL_ASSETS_STREAM_MANAGER_SERVICE_IMPL_H_ diff --git a/asset_stream_manager/main.cc b/cdc_stream/main.cc similarity index 90% rename from asset_stream_manager/main.cc rename to cdc_stream/main.cc index 819b288..0c349f2 100644 --- a/asset_stream_manager/main.cc +++ b/cdc_stream/main.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/start_command.h" -#include "asset_stream_manager/start_service_command.h" -#include "asset_stream_manager/stop_command.h" +#include "cdc_stream/start_command.h" +#include "cdc_stream/start_service_command.h" +#include "cdc_stream/stop_command.h" #include "lyra/lyra.hpp" int main(int argc, char* argv[]) { diff --git a/asset_stream_manager/metrics_recorder.cc b/cdc_stream/metrics_recorder.cc similarity index 98% rename from asset_stream_manager/metrics_recorder.cc rename to cdc_stream/metrics_recorder.cc index b6373dc..07bc058 100644 --- a/asset_stream_manager/metrics_recorder.cc +++ b/cdc_stream/metrics_recorder.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/metrics_recorder.h" +#include "cdc_stream/metrics_recorder.h" #include "common/log.h" diff --git a/asset_stream_manager/metrics_recorder.h b/cdc_stream/metrics_recorder.h similarity index 93% rename from asset_stream_manager/metrics_recorder.h rename to cdc_stream/metrics_recorder.h index 0c3b5b3..5214b4f 100644 --- a/asset_stream_manager/metrics_recorder.h +++ b/cdc_stream/metrics_recorder.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_METRICS_RECORDER_H_ -#define ASSET_STREAM_MANAGER_METRICS_RECORDER_H_ +#ifndef CDC_STREAM_METRICS_RECORDER_H_ +#define CDC_STREAM_METRICS_RECORDER_H_ #include "absl/status/status.h" #include "common/util.h" @@ -74,4 +74,4 @@ class SessionMetricsRecorder : public MetricsRecorder { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_METRICS_RECORDER_H_ +#endif // CDC_STREAM_METRICS_RECORDER_H_ diff --git a/asset_stream_manager/metrics_recorder_test.cc b/cdc_stream/metrics_recorder_test.cc similarity index 98% rename from asset_stream_manager/metrics_recorder_test.cc rename to cdc_stream/metrics_recorder_test.cc index 706ae02..ebd298a 100644 --- a/asset_stream_manager/metrics_recorder_test.cc +++ b/cdc_stream/metrics_recorder_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/metrics_recorder.h" +#include "cdc_stream/metrics_recorder.h" #include "common/status_test_macros.h" #include "gtest/gtest.h" diff --git a/asset_stream_manager/multi_session.cc b/cdc_stream/multi_session.cc similarity index 99% rename from asset_stream_manager/multi_session.cc rename to cdc_stream/multi_session.cc index 989acd9..d79171c 100644 --- a/asset_stream_manager/multi_session.cc +++ b/cdc_stream/multi_session.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/multi_session.h" +#include "cdc_stream/multi_session.h" -#include "asset_stream_manager/session.h" +#include "cdc_stream/session.h" #include "common/file_watcher_win.h" #include "common/log.h" #include "common/path.h" diff --git a/asset_stream_manager/multi_session.h b/cdc_stream/multi_session.h similarity index 97% rename from asset_stream_manager/multi_session.h rename to cdc_stream/multi_session.h index 52a8f76..532c699 100644 --- a/asset_stream_manager/multi_session.h +++ b/cdc_stream/multi_session.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_MULTI_SESSION_H_ -#define ASSET_STREAM_MANAGER_MULTI_SESSION_H_ +#ifndef CDC_STREAM_MULTI_SESSION_H_ +#define CDC_STREAM_MULTI_SESSION_H_ #include #include @@ -24,9 +24,9 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "asset_stream_manager/asset_stream_server.h" -#include "asset_stream_manager/metrics_recorder.h" -#include "asset_stream_manager/session_config.h" +#include "cdc_stream/asset_stream_server.h" +#include "cdc_stream/metrics_recorder.h" +#include "cdc_stream/session_config.h" #include "common/stopwatch.h" #include "data_store/data_store_writer.h" #include "manifest/file_chunk_map.h" @@ -264,4 +264,4 @@ class MultiSession { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_MULTI_SESSION_H_ +#endif // CDC_STREAM_MULTI_SESSION_H_ diff --git a/asset_stream_manager/multi_session_test.cc b/cdc_stream/multi_session_test.cc similarity index 99% rename from asset_stream_manager/multi_session_test.cc rename to cdc_stream/multi_session_test.cc index c76ea24..753f6b5 100644 --- a/asset_stream_manager/multi_session_test.cc +++ b/cdc_stream/multi_session_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/multi_session.h" +#include "cdc_stream/multi_session.h" #include #include @@ -20,7 +20,7 @@ #include #include "absl/strings/match.h" -#include "asset_stream_manager/testing_asset_stream_server.h" +#include "cdc_stream/testing_asset_stream_server.h" #include "common/path.h" #include "common/platform.h" #include "common/process.h" diff --git a/asset_stream_manager/session.cc b/cdc_stream/session.cc similarity index 98% rename from asset_stream_manager/session.cc rename to cdc_stream/session.cc index ef5fed2..e014c8f 100644 --- a/asset_stream_manager/session.cc +++ b/cdc_stream/session.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/session.h" +#include "cdc_stream/session.h" -#include "asset_stream_manager/cdc_fuse_manager.h" +#include "cdc_stream/cdc_fuse_manager.h" #include "common/log.h" #include "common/port_manager.h" #include "common/status.h" diff --git a/asset_stream_manager/session.h b/cdc_stream/session.h similarity index 93% rename from asset_stream_manager/session.h rename to cdc_stream/session.h index 424c795..c9dc9f3 100644 --- a/asset_stream_manager/session.h +++ b/cdc_stream/session.h @@ -14,16 +14,16 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_SESSION_H_ -#define ASSET_STREAM_MANAGER_SESSION_H_ +#ifndef CDC_STREAM_SESSION_H_ +#define CDC_STREAM_SESSION_H_ #include #include #include #include "absl/status/status.h" -#include "asset_stream_manager/metrics_recorder.h" -#include "asset_stream_manager/session_config.h" +#include "cdc_stream/metrics_recorder.h" +#include "cdc_stream/session_config.h" #include "common/remote_util.h" namespace cdc_ft { @@ -100,4 +100,4 @@ class Session { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_SESSION_H_ +#endif // CDC_STREAM_SESSION_H_ diff --git a/asset_stream_manager/session_config.h b/cdc_stream/session_config.h similarity index 92% rename from asset_stream_manager/session_config.h rename to cdc_stream/session_config.h index 19bb357..89e36c3 100644 --- a/asset_stream_manager/session_config.h +++ b/cdc_stream/session_config.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_SESSION_CONFIG_H_ -#define ASSET_STREAM_MANAGER_SESSION_CONFIG_H_ +#ifndef CDC_STREAM_SESSION_CONFIG_H_ +#define CDC_STREAM_SESSION_CONFIG_H_ #include @@ -60,4 +60,4 @@ struct SessionConfig { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_SESSION_CONFIG_H_ +#endif // CDC_STREAM_SESSION_CONFIG_H_ diff --git a/asset_stream_manager/session_management_server.cc b/cdc_stream/session_management_server.cc similarity index 87% rename from asset_stream_manager/session_management_server.cc rename to cdc_stream/session_management_server.cc index 33e8a56..6a8e358 100644 --- a/asset_stream_manager/session_management_server.cc +++ b/cdc_stream/session_management_server.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/session_management_server.h" +#include "cdc_stream/session_management_server.h" #include "absl/strings/str_format.h" -#include "asset_stream_manager/background_service_impl.h" -#include "asset_stream_manager/local_assets_stream_manager_service_impl.h" -#include "asset_stream_manager/session_manager.h" +#include "cdc_stream/background_service_impl.h" +#include "cdc_stream/local_assets_stream_manager_service_impl.h" +#include "cdc_stream/session_manager.h" #include "common/log.h" #include "common/status.h" #include "common/status_macros.h" @@ -56,8 +56,7 @@ absl::Status SessionManagementServer::Start(int port) { } if (!server_) { return MakeStatus( - "Failed to start session management server. Check asset_stream_manager " - "logs."); + "Failed to start session management server. Check cdc_stream logs."); } LOG_INFO("Session management server listening on '%s'", server_address); return absl::OkStatus(); diff --git a/asset_stream_manager/session_management_server.h b/cdc_stream/session_management_server.h similarity index 90% rename from asset_stream_manager/session_management_server.h rename to cdc_stream/session_management_server.h index 95bf76f..0b790a7 100644 --- a/asset_stream_manager/session_management_server.h +++ b/cdc_stream/session_management_server.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_SESSION_MANAGEMENT_SERVER_H_ -#define ASSET_STREAM_MANAGER_SESSION_MANAGEMENT_SERVER_H_ +#ifndef CDC_STREAM_SESSION_MANAGEMENT_SERVER_H_ +#define CDC_STREAM_SESSION_MANAGEMENT_SERVER_H_ #include @@ -62,4 +62,4 @@ class SessionManagementServer { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_SESSION_MANAGEMENT_SERVER_H_ +#endif // CDC_STREAM_SESSION_MANAGEMENT_SERVER_H_ diff --git a/asset_stream_manager/session_manager.cc b/cdc_stream/session_manager.cc similarity index 98% rename from asset_stream_manager/session_manager.cc rename to cdc_stream/session_manager.cc index 6e10001..a34483e 100644 --- a/asset_stream_manager/session_manager.cc +++ b/cdc_stream/session_manager.cc @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/session_manager.h" +#include "cdc_stream/session_manager.h" #include "absl/strings/str_split.h" -#include "asset_stream_manager/multi_session.h" +#include "cdc_stream/multi_session.h" #include "common/log.h" #include "common/process.h" #include "common/status.h" diff --git a/asset_stream_manager/session_manager.h b/cdc_stream/session_manager.h similarity index 95% rename from asset_stream_manager/session_manager.h rename to cdc_stream/session_manager.h index acc6e16..079663c 100644 --- a/asset_stream_manager/session_manager.h +++ b/cdc_stream/session_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_SESSION_MANAGER_H_ -#define ASSET_STREAM_MANAGER_SESSION_MANAGER_H_ +#ifndef CDC_STREAM_SESSION_MANAGER_H_ +#define CDC_STREAM_SESSION_MANAGER_H_ #include #include @@ -23,7 +23,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/synchronization/mutex.h" -#include "asset_stream_manager/session_config.h" +#include "cdc_stream/session_config.h" #include "metrics/metrics.h" namespace cdc_ft { @@ -100,4 +100,4 @@ class SessionManager { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_SESSION_MANAGER_H_ +#endif // CDC_STREAM_SESSION_MANAGER_H_ diff --git a/asset_stream_manager/start_command.cc b/cdc_stream/start_command.cc similarity index 95% rename from asset_stream_manager/start_command.cc rename to cdc_stream/start_command.cc index 01894c1..c346c4e 100644 --- a/asset_stream_manager/start_command.cc +++ b/cdc_stream/start_command.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/start_command.h" +#include "cdc_stream/start_command.h" #include -#include "asset_stream_manager/local_assets_stream_manager_client.h" -#include "asset_stream_manager/session_management_server.h" +#include "cdc_stream/local_assets_stream_manager_client.h" +#include "cdc_stream/session_management_server.h" #include "common/log.h" #include "common/path.h" #include "common/remote_util.h" diff --git a/asset_stream_manager/start_command.h b/cdc_stream/start_command.h similarity index 86% rename from asset_stream_manager/start_command.h rename to cdc_stream/start_command.h index 3fb8ef8..b38f0a4 100644 --- a/asset_stream_manager/start_command.h +++ b/cdc_stream/start_command.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_START_COMMAND_H_ -#define ASSET_STREAM_MANAGER_START_COMMAND_H_ +#ifndef CDC_STREAM_START_COMMAND_H_ +#define CDC_STREAM_START_COMMAND_H_ #include "absl/status/status.h" -#include "asset_stream_manager/base_command.h" +#include "cdc_stream/base_command.h" namespace cdc_ft { @@ -45,4 +45,4 @@ class StartCommand : public BaseCommand { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_START_COMMAND_H_ +#endif // CDC_STREAM_START_COMMAND_H_ diff --git a/asset_stream_manager/start_service_command.cc b/cdc_stream/start_service_command.cc similarity index 93% rename from asset_stream_manager/start_service_command.cc rename to cdc_stream/start_service_command.cc index 53d832f..88e2dbe 100644 --- a/asset_stream_manager/start_service_command.cc +++ b/cdc_stream/start_service_command.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/start_service_command.h" +#include "cdc_stream/start_service_command.h" -#include "asset_stream_manager/background_service_impl.h" -#include "asset_stream_manager/local_assets_stream_manager_service_impl.h" -#include "asset_stream_manager/session_management_server.h" -#include "asset_stream_manager/session_manager.h" +#include "cdc_stream/background_service_impl.h" +#include "cdc_stream/local_assets_stream_manager_service_impl.h" +#include "cdc_stream/session_management_server.h" +#include "cdc_stream/session_manager.h" #include "common/clock.h" #include "common/grpc_status.h" #include "common/log.h" @@ -95,7 +95,7 @@ absl::Status StartServiceCommand::Run() { if (!status.ok()) { LOG_ERROR("%s", status.ToString()); } else { - LOG_INFO("Asset stream manager shut down successfully."); + LOG_INFO("Streaming service shut down successfully."); } return status; diff --git a/asset_stream_manager/start_service_command.h b/cdc_stream/start_service_command.h similarity index 83% rename from asset_stream_manager/start_service_command.h rename to cdc_stream/start_service_command.h index bcc1a59..ae67ba1 100644 --- a/asset_stream_manager/start_service_command.h +++ b/cdc_stream/start_service_command.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_START_SERVICE_COMMAND_H_ -#define ASSET_STREAM_MANAGER_START_SERVICE_COMMAND_H_ +#ifndef CDC_STREAM_START_SERVICE_COMMAND_H_ +#define CDC_STREAM_START_SERVICE_COMMAND_H_ #include #include "absl/status/status.h" #include "absl/status/statusor.h" -#include "asset_stream_manager/asset_stream_config.h" -#include "asset_stream_manager/base_command.h" +#include "cdc_stream/asset_stream_config.h" +#include "cdc_stream/base_command.h" namespace cdc_ft { @@ -51,4 +51,4 @@ class StartServiceCommand : public BaseCommand { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_START_SERVICE_COMMAND_H_ +#endif // CDC_STREAM_START_SERVICE_COMMAND_H_ diff --git a/asset_stream_manager/stop_command.cc b/cdc_stream/stop_command.cc similarity index 93% rename from asset_stream_manager/stop_command.cc rename to cdc_stream/stop_command.cc index 5278efc..753cf58 100644 --- a/asset_stream_manager/stop_command.cc +++ b/cdc_stream/stop_command.cc @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/stop_command.h" +#include "cdc_stream/stop_command.h" #include -#include "asset_stream_manager/local_assets_stream_manager_client.h" -#include "asset_stream_manager/session_management_server.h" +#include "cdc_stream/local_assets_stream_manager_client.h" +#include "cdc_stream/session_management_server.h" #include "common/log.h" #include "common/path.h" #include "common/status_macros.h" diff --git a/asset_stream_manager/stop_command.h b/cdc_stream/stop_command.h similarity index 85% rename from asset_stream_manager/stop_command.h rename to cdc_stream/stop_command.h index 12b35ac..b5303e0 100644 --- a/asset_stream_manager/stop_command.h +++ b/cdc_stream/stop_command.h @@ -14,11 +14,11 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_STOP_COMMAND_H_ -#define ASSET_STREAM_MANAGER_STOP_COMMAND_H_ +#ifndef CDC_STREAM_STOP_COMMAND_H_ +#define CDC_STREAM_STOP_COMMAND_H_ #include "absl/status/status.h" -#include "asset_stream_manager/base_command.h" +#include "cdc_stream/base_command.h" namespace cdc_ft { @@ -41,4 +41,4 @@ class StopCommand : public BaseCommand { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_STOP_COMMAND_H_ +#endif // CDC_STREAM_STOP_COMMAND_H_ diff --git a/asset_stream_manager/testdata/multi_session/non_empty/a.txt b/cdc_stream/testdata/multi_session/non_empty/a.txt similarity index 100% rename from asset_stream_manager/testdata/multi_session/non_empty/a.txt rename to cdc_stream/testdata/multi_session/non_empty/a.txt diff --git a/asset_stream_manager/testdata/multi_session/non_empty/subdir/b.txt b/cdc_stream/testdata/multi_session/non_empty/subdir/b.txt similarity index 100% rename from asset_stream_manager/testdata/multi_session/non_empty/subdir/b.txt rename to cdc_stream/testdata/multi_session/non_empty/subdir/b.txt diff --git a/asset_stream_manager/testdata/multi_session/non_empty/subdir/c.txt b/cdc_stream/testdata/multi_session/non_empty/subdir/c.txt similarity index 100% rename from asset_stream_manager/testdata/multi_session/non_empty/subdir/c.txt rename to cdc_stream/testdata/multi_session/non_empty/subdir/c.txt diff --git a/asset_stream_manager/testdata/multi_session/non_empty/subdir/d.txt b/cdc_stream/testdata/multi_session/non_empty/subdir/d.txt similarity index 100% rename from asset_stream_manager/testdata/multi_session/non_empty/subdir/d.txt rename to cdc_stream/testdata/multi_session/non_empty/subdir/d.txt diff --git a/asset_stream_manager/testdata/root.txt b/cdc_stream/testdata/root.txt similarity index 100% rename from asset_stream_manager/testdata/root.txt rename to cdc_stream/testdata/root.txt diff --git a/asset_stream_manager/testing_asset_stream_server.cc b/cdc_stream/testing_asset_stream_server.cc similarity index 96% rename from asset_stream_manager/testing_asset_stream_server.cc rename to cdc_stream/testing_asset_stream_server.cc index 4a737dc..c7136aa 100644 --- a/asset_stream_manager/testing_asset_stream_server.cc +++ b/cdc_stream/testing_asset_stream_server.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "asset_stream_manager/testing_asset_stream_server.h" +#include "cdc_stream/testing_asset_stream_server.h" #include "data_store/data_store_reader.h" #include "manifest/file_chunk_map.h" diff --git a/asset_stream_manager/testing_asset_stream_server.h b/cdc_stream/testing_asset_stream_server.h similarity index 87% rename from asset_stream_manager/testing_asset_stream_server.h rename to cdc_stream/testing_asset_stream_server.h index 153ff3d..29ab11d 100644 --- a/asset_stream_manager/testing_asset_stream_server.h +++ b/cdc_stream/testing_asset_stream_server.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef ASSET_STREAM_MANAGER_TESTING_ASSET_STREAM_SERVER_H_ -#define ASSET_STREAM_MANAGER_TESTING_ASSET_STREAM_SERVER_H_ +#ifndef CDC_STREAM_TESTING_ASSET_STREAM_SERVER_H_ +#define CDC_STREAM_TESTING_ASSET_STREAM_SERVER_H_ #include #include @@ -23,7 +23,7 @@ #include "absl/base/thread_annotations.h" #include "absl/status/status.h" #include "absl/synchronization/mutex.h" -#include "asset_stream_manager/grpc_asset_stream_server.h" +#include "cdc_stream/grpc_asset_stream_server.h" #include "manifest/manifest_proto_defs.h" namespace cdc_ft { @@ -57,4 +57,4 @@ class TestingAssetStreamServer : public AssetStreamServer { } // namespace cdc_ft -#endif // ASSET_STREAM_MANAGER_TESTING_ASSET_STREAM_SERVER_H_ +#endif // CDC_STREAM_TESTING_ASSET_STREAM_SERVER_H_ diff --git a/file_transfer.sln b/file_transfer.sln index 755fce1..73520f5 100644 --- a/file_transfer.sln +++ b/file_transfer.sln @@ -8,15 +8,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdc_rsync", "cdc_rsync\cdc_ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdc_rsync_server", "cdc_rsync_server\cdc_rsync_server.vcxproj", "{4ECE65E0-D950-4B96-8AD5-0313261B8C8D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Asset Streaming 3.0", "Asset Streaming 3.0", "{E4C4704F-C5C8-4A1D-B7E7-4D201DD29585}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CDC Stream", "CDC Stream", "{E4C4704F-C5C8-4A1D-B7E7-4D201DD29585}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdc_fuse_fs", "cdc_fuse_fs\cdc_fuse_fs.vcxproj", "{A537310C-0571-43D5-B7FE-C867F702294F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asset_stream_manager", "asset_stream_manager\asset_stream_manager.vcxproj", "{84D81562-D66C-4A60-9F48-2696D7D81D26}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdc_stream", "cdc_stream\cdc_stream.vcxproj", "{84D81562-D66C-4A60-9F48-2696D7D81D26}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "all_files", "all_files.vcxitems", "{F542AF2D-5A17-4F55-BE40-B1A2A6182811}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_asset_streaming_30", "tests_asset_streaming_30\tests_asset_streaming_30.vcxproj", "{2B36A6AA-FD11-4F77-A79B-29A3B185E701}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_cdc_stream", "tests_cdc_stream\tests_cdc_stream.vcxproj", "{2B36A6AA-FD11-4F77-A79B-29A3B185E701}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tests_cdc_rsync", "tests_cdc_rsync\tests_cdc_rsync.vcxproj", "{DBFE017C-31F0-47CA-9649-06F3C3CF0E41}" EndProject diff --git a/manifest/manifest_builder.h b/manifest/manifest_builder.h index 693a2a0..acd9916 100644 --- a/manifest/manifest_builder.h +++ b/manifest/manifest_builder.h @@ -34,8 +34,6 @@ namespace cdc_ft { // finalized with a call to Flush(). When the CdcParamsProto given during // construction specifies an average chunk size, then the manifest will be split // into balanced chunks of at most this size. -// -// See (internal). class ManifestBuilder { public: // Default permission bits for new directories and files, respectively. diff --git a/proto/manifest.proto b/proto/manifest.proto index f9904db..bb50e16 100644 --- a/proto/manifest.proto +++ b/proto/manifest.proto @@ -12,12 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// This proto defines the manifest format used for Asset Streaming 3.0 and -// package diffing. -// -// References: -// * (internal).0 -// * (internal) +// This proto defines the manifest format used for CDC Stream. syntax = "proto3"; diff --git a/tests_asset_streaming_30/.gitignore b/tests_cdc_stream/.gitignore similarity index 100% rename from tests_asset_streaming_30/.gitignore rename to tests_cdc_stream/.gitignore diff --git a/tests_asset_streaming_30/BUILD b/tests_cdc_stream/BUILD similarity index 86% rename from tests_asset_streaming_30/BUILD rename to tests_cdc_stream/BUILD index 9ef88f4..c8267e5 100644 --- a/tests_asset_streaming_30/BUILD +++ b/tests_cdc_stream/BUILD @@ -12,25 +12,25 @@ package(default_visibility = ["//visibility:public"]) # To run this target with Bazel directly, just use "bazel run" instead of # "bazel test". cc_binary( - name = "tests_asset_streaming_30", + name = "tests_cdc_stream", testonly = True, srcs = [ - "//asset_stream_manager:all_test_sources", "//cdc_fuse_fs:all_test_sources", + "//cdc_stream:all_test_sources", "//data_store:all_test_sources", "//manifest:all_test_sources", "//metrics:all_test_sources", ], data = [ - "//asset_stream_manager:all_test_data", + "//cdc_stream:all_test_data", "//manifest:all_test_data", ], deps = [ - "//asset_stream_manager:metrics_recorder", - "//asset_stream_manager:multi_session", "//cdc_fuse_fs:asset", "//cdc_fuse_fs:cdc_fuse_fs_lib_mocked", "//cdc_fuse_fs:mock_config_stream_client", + "//cdc_stream:metrics_recorder", + "//cdc_stream:multi_session", "//common:test_main", "//common:testing_clock", "//data_store:data_provider", diff --git a/tests_asset_streaming_30/tests_asset_streaming_30.vcxproj b/tests_cdc_stream/tests_cdc_stream.vcxproj similarity index 91% rename from tests_asset_streaming_30/tests_asset_streaming_30.vcxproj rename to tests_cdc_stream/tests_cdc_stream.vcxproj index 49a78a3..d69ee20 100644 --- a/tests_asset_streaming_30/tests_asset_streaming_30.vcxproj +++ b/tests_cdc_stream/tests_cdc_stream.vcxproj @@ -14,17 +14,17 @@ 15.0 {2B36A6AA-FD11-4F77-A79B-29A3B185E701} Win32Proj - tests_asset_streaming_30 + tests_cdc_stream $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) 10.0 - $(SolutionDir)bazel-out\x64_windows-opt\bin\tests_asset_streaming_30\ + $(SolutionDir)bazel-out\x64_windows-opt\bin\tests_cdc_stream\ UNICODE /std:c++17 - $(SolutionDir)bazel-out\x64_windows-dbg\bin\tests_asset_streaming_30\ + $(SolutionDir)bazel-out\x64_windows-dbg\bin\tests_cdc_stream\ UNICODE /std:c++17 @@ -59,8 +59,8 @@ - //tests_asset_streaming_30 - tests_asset_streaming_30.exe + //tests_cdc_stream + tests_cdc_stream.exe ..\;..\third_party\absl;..\bazel-cdc-file-transfer\external\com_github_jsoncpp\include;..\bazel-cdc-file-transfer\external\com_github_blake3\c;..\third_party\googletest\googletest\include;..\bazel-cdc-file-transfer\external\com_google_protobuf\src;..\bazel-cdc-file-transfer\external\com_github_grpc_grpc\include;..\bazel-out\x64_windows-dbg\bin;$(VC_IncludePath);$(WindowsSDK_IncludePath) diff --git a/third_party/lyra/BUILD.bazel b/third_party/lyra/BUILD.bazel index 4329b4e..2c57277 100644 --- a/third_party/lyra/BUILD.bazel +++ b/third_party/lyra/BUILD.bazel @@ -2,12 +2,14 @@ # This project provides Linux compatible Dirent interface for Microsoft Windows. # +load("@rules_cc//cc:defs.bzl", "cc_library") + +package(default_visibility = ["//visibility:public"]) + licenses(["notice"]) # BSL-1.0 license exports_files(["LICENSE"]) -package(default_visibility = ["//visibility:public"]) - cc_library( name = "lyra", hdrs = [