diff options
| m--------- | doc/html | 8 | ||||
| -rw-r--r-- | include/afio/revision.hpp | 6 | ||||
| m--------- | include/afio/v2.0/outcome | 0 | ||||
| m--------- | include/afio/v2.0/quickcpplib | 0 | ||||
| -rw-r--r-- | programs/key-value-store/include/key_value_store.hpp | 12 | ||||
| m--------- | test/kerneltest | 0 |
6 files changed, 13 insertions, 13 deletions
diff --git a/doc/html b/doc/html -Subproject 3f9749d267d2f3e92004ee0bcdd1a9b9d5be527 +Subproject 5375617329a7ee85a591f119cadf3a7768632ac diff --git a/include/afio/revision.hpp b/include/afio/revision.hpp index 3d7522d4..3ac36e29 100644 --- a/include/afio/revision.hpp +++ b/include/afio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define AFIO_PREVIOUS_COMMIT_REF 9167b3ce24dfac119c42c9c7152a8fcb973b44c4 -#define AFIO_PREVIOUS_COMMIT_DATE "2018-05-28 08:34:05 +00:00" -#define AFIO_PREVIOUS_COMMIT_UNIQUE 9167b3ce +#define AFIO_PREVIOUS_COMMIT_REF b1dc5922f0f56782e50aa2af2655c0235d67ecd0 +#define AFIO_PREVIOUS_COMMIT_DATE "2018-05-28 18:22:45 +00:00" +#define AFIO_PREVIOUS_COMMIT_UNIQUE b1dc5922 diff --git a/include/afio/v2.0/outcome b/include/afio/v2.0/outcome -Subproject 7efba82bee97fb6f499e8de4041584b3ba39355 +Subproject 4f12238c22e16052949413704d30a4eae6aecd5 diff --git a/include/afio/v2.0/quickcpplib b/include/afio/v2.0/quickcpplib -Subproject 1d0c3a143fb83410e34c52a2f4081c29a226619 +Subproject 71e7d496a726771aa92cb3ec5539f917d342d6e diff --git a/programs/key-value-store/include/key_value_store.hpp b/programs/key-value-store/include/key_value_store.hpp index b41d965f..9ef3af06 100644 --- a/programs/key-value-store/include/key_value_store.hpp +++ b/programs/key-value-store/include/key_value_store.hpp @@ -280,7 +280,7 @@ namespace key_value_store if(indexinuse.has_value()) { // I am the first entrant into this data store - if(_indexfile.length().value() == 0) + if(_indexfile.maximum_extent().value() == 0) { afio::file_handle::extent_type size = sizeof(index::index) + (hashtableentries) * sizeof(index::open_hash_index::value_type); size = afio::utils::round_up_to_page_size(size); @@ -356,7 +356,7 @@ namespace key_value_store // I am the last user if(_indexheader->contents_hashed) { - _indexheader->hash = QUICKCPPLIB_NAMESPACE::algorithm::hash::fast_hash::hash((char *) _indexheader, _indexfile.length().value()); + _indexheader->hash = QUICKCPPLIB_NAMESPACE::algorithm::hash::fast_hash::hash((char *) _indexheader, _indexfile.maximum_extent().value()); } } } @@ -375,7 +375,7 @@ namespace key_value_store _smallfiles.mapped.reserve(_smallfiles.blocking.size()); for(size_t n = 0; n < _smallfiles.blocking.size(); n++) { - auto currentlength = _smallfiles.blocking[n].length().value(); + auto currentlength = _smallfiles.blocking[n].maximum_extent().value(); _smallfiles.mapped.push_back(afio::mapped_file_handle(std::move(_smallfiles.blocking[n]), currentlength + overextension)); } _smallfileguard.set_handle(&_smallfiles.mapped[_mysmallfileidx]); @@ -482,7 +482,7 @@ namespace key_value_store bool free_on_destruct = _smallfiles.mapped.empty(); if(!free_on_destruct) { - auto mappedlength = _smallfiles.mapped[item.value_identifier].length().value(); + auto mappedlength = _smallfiles.mapped[item.value_identifier].maximum_extent().value(); if(item.value_offset * 64 > mappedlength) { // Update mapping to match the underlying file @@ -739,7 +739,7 @@ namespace key_value_store bool items_written = false; if(!_parent->_smallfiles.mapped.empty()) { - afio::file_handle::extent_type original_length = _parent->_mysmallfile.length().value(); + afio::file_handle::extent_type original_length = _parent->_mysmallfile.maximum_extent().value(); // How big does this map need to be? size_t totalcommitsize = 0; for(size_t n = 0; n < _items.size(); n++) @@ -803,7 +803,7 @@ namespace key_value_store if(!items_written) { // Gather append write all my items to my smallfile - afio::file_handle::extent_type value_offset = _parent->_mysmallfile.length().value(); + afio::file_handle::extent_type value_offset = _parent->_mysmallfile.maximum_extent().value(); assert((value_offset % 64) == 0); // POSIX guarantees that at least 16 gather buffers can be written in a single shot std::vector<afio::file_handle::const_buffer_type> reqs; diff --git a/test/kerneltest b/test/kerneltest -Subproject 04dcd927ddc365efe0a2caa3566ab89898b3b50 +Subproject 4a2e63e68412abf89b0685c2f5f9fae25deb685 |