-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for single-step write to S3, instead of multi-part
* Primarily for compatibility with GCS, where the S3 compatibility mode does not support S3 multi-part uploads. Controlled by the new config parameter `s3.use_multipart_upload`, default `true`. * Add test for S3 direct write * Add note to HISTORY
- Loading branch information
Showing
15 changed files
with
362 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,170 @@ | ||
| /** | ||
| * @file unit-s3.cc | ||
| * | ||
| * @section LICENSE | ||
| * | ||
| * The MIT License | ||
| * | ||
| * @copyright Copyright (c) 2017-2019 TileDB, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * @section DESCRIPTION | ||
| * | ||
| * Tests for S3 API filesystem functions. | ||
| */ | ||
|
|
||
| #ifdef HAVE_S3 | ||
|
|
||
| #include "catch.hpp" | ||
| #include "tiledb/sm/filesystem/s3.h" | ||
| #include "tiledb/sm/global_state/unit_test_config.h" | ||
| #include "tiledb/sm/misc/thread_pool.h" | ||
| #include "tiledb/sm/misc/utils.h" | ||
| #include "tiledb/sm/storage_manager/config.h" | ||
|
|
||
| #include <fstream> | ||
| #include <thread> | ||
|
|
||
| using namespace tiledb::sm; | ||
|
|
||
| struct S3DirectFx { | ||
| const std::string S3_PREFIX = "s3://"; | ||
| const tiledb::sm::URI S3_BUCKET = | ||
| tiledb::sm::URI(S3_PREFIX + random_bucket_name("tiledb") + "/"); | ||
| const std::string TEST_DIR = S3_BUCKET.to_string() + "tiledb_test_dir/"; | ||
| tiledb::sm::S3 s3_; | ||
| ThreadPool thread_pool_; | ||
|
|
||
| S3DirectFx(); | ||
| ~S3DirectFx(); | ||
|
|
||
| static std::string random_bucket_name(const std::string& prefix); | ||
| }; | ||
|
|
||
| S3DirectFx::S3DirectFx() { | ||
| // Connect | ||
| Config::S3Params s3_config; | ||
| #ifndef TILEDB_TESTS_AWS_S3_CONFIG | ||
| s3_config.endpoint_override_ = "localhost:9999"; | ||
| s3_config.scheme_ = "http"; | ||
| s3_config.use_virtual_addressing_ = false; | ||
| #endif | ||
| s3_config.use_multipart_upload_ = false; | ||
| REQUIRE(thread_pool_.init(2).ok()); | ||
| REQUIRE(s3_.init(s3_config, &thread_pool_).ok()); | ||
|
|
||
| // Create bucket | ||
| if (s3_.is_bucket(S3_BUCKET)) | ||
| REQUIRE(s3_.remove_bucket(S3_BUCKET).ok()); | ||
|
|
||
| REQUIRE(!s3_.is_bucket(S3_BUCKET)); | ||
| REQUIRE(s3_.create_bucket(S3_BUCKET).ok()); | ||
|
|
||
| // Check if bucket is empty | ||
| bool is_empty; | ||
| REQUIRE(s3_.is_empty_bucket(S3_BUCKET, &is_empty).ok()); | ||
| CHECK(is_empty); | ||
| } | ||
|
|
||
| S3DirectFx::~S3DirectFx() { | ||
| // Empty bucket | ||
| bool is_empty; | ||
| CHECK(s3_.is_empty_bucket(S3_BUCKET, &is_empty).ok()); | ||
| if (!is_empty) { | ||
| CHECK(s3_.empty_bucket(S3_BUCKET).ok()); | ||
| CHECK(s3_.is_empty_bucket(S3_BUCKET, &is_empty).ok()); | ||
| CHECK(is_empty); | ||
| } | ||
|
|
||
| // Delete bucket | ||
| CHECK(s3_.remove_bucket(S3_BUCKET).ok()); | ||
| } | ||
|
|
||
| TEST_CASE_METHOD( | ||
| S3DirectFx, | ||
| "Test S3 filesystem, file I/O with multipart API disabled", | ||
| "[s3]") { | ||
| // Prepare buffers | ||
| uint64_t buffer_size = 5 * 1024 * 1024; | ||
| auto write_buffer = new char[buffer_size]; | ||
| for (uint64_t i = 0; i < buffer_size; i++) | ||
| write_buffer[i] = (char)('a' + (i % 26)); | ||
| uint64_t buffer_size_small = 1024 * 1024; | ||
| auto write_buffer_small = new char[buffer_size_small]; | ||
| for (uint64_t i = 0; i < buffer_size_small; i++) | ||
| write_buffer_small[i] = (char)('a' + (i % 26)); | ||
|
|
||
| // Write to two files | ||
| auto largefile = TEST_DIR + "largefile"; | ||
| CHECK(s3_.write(URI(largefile), write_buffer, buffer_size).ok()); | ||
| CHECK(s3_.write(URI(largefile), write_buffer_small, buffer_size_small).ok()); | ||
| auto smallfile = TEST_DIR + "smallfile"; | ||
| CHECK(s3_.write(URI(smallfile), write_buffer_small, buffer_size_small).ok()); | ||
|
|
||
| // Before flushing, the files do not exist | ||
| CHECK(!s3_.is_object(URI(largefile))); | ||
| CHECK(!s3_.is_object(URI(smallfile))); | ||
|
|
||
| // Flush the files | ||
| CHECK(s3_.flush_object(URI(largefile)).ok()); | ||
| CHECK(s3_.flush_object(URI(smallfile)).ok()); | ||
|
|
||
| // After flushing, the files exist | ||
| CHECK(s3_.is_object(URI(largefile))); | ||
| CHECK(s3_.is_object(URI(smallfile))); | ||
|
|
||
| // Get file sizes | ||
| uint64_t nbytes = 0; | ||
| CHECK(s3_.object_size(URI(largefile), &nbytes).ok()); | ||
| CHECK(nbytes == (buffer_size + buffer_size_small)); | ||
| CHECK(s3_.object_size(URI(smallfile), &nbytes).ok()); | ||
| CHECK(nbytes == buffer_size_small); | ||
|
|
||
| // Read from the beginning | ||
| auto read_buffer = new char[26]; | ||
| CHECK(s3_.read(URI(largefile), 0, read_buffer, 26).ok()); | ||
| bool allok = true; | ||
| for (int i = 0; i < 26; i++) { | ||
| if (read_buffer[i] != static_cast<char>('a' + i)) { | ||
| allok = false; | ||
| break; | ||
| } | ||
| } | ||
| CHECK(allok); | ||
|
|
||
| // Read from a different offset | ||
| CHECK(s3_.read(URI(largefile), 11, read_buffer, 26).ok()); | ||
| allok = true; | ||
| for (int i = 0; i < 26; i++) { | ||
| if (read_buffer[i] != static_cast<char>('a' + (i + 11) % 26)) { | ||
| allok = false; | ||
| break; | ||
| } | ||
| } | ||
| CHECK(allok); | ||
| } | ||
|
|
||
| std::string S3DirectFx::random_bucket_name(const std::string& prefix) { | ||
| std::stringstream ss; | ||
| ss << prefix << "-" << std::this_thread::get_id() << "-" | ||
| << tiledb::sm::utils::time::timestamp_now_ms(); | ||
| return ss.str(); | ||
| } | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.