AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Maxim Pimenov 2019-01-25 16:14:36 +03:00 • committed by Arsentiy Milchakov
parent cf6935d87c
commit 1789a1f6d4
3 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
3party/bsdiff-courgette/bsdiff/bsdiff.h
View file

@ -143,20 +143,9 @@ BSDiffStatus CreateBinaryPatch(OldReader & old_reader,
old_source.Read(old_buf.data(), old_buf.size());
const uint8_t * old = old_buf.data();
std::vector<divsuf::saidx_t> I;
try
{
I.resize(old_size + 1);
}
catch (...)
{
LOG(LERROR, ("Could not allocate I[], ", ((old_size + 1) * sizeof(int)), "bytes"));
return MEM_ERROR;
}
std::vector<divsuf::saidx_t> suffix_array(old_size + 1);
base::Timer suf_sort_timer;
divsuf::saint_t result = divsuf::divsufsort_include_empty(
old, I.data(), old_size);
divsuf::saint_t result = divsuf::divsufsort_include_empty(old, suffix_array.data(), old_size);
LOG(LINFO, ("Done divsufsort", suf_sort_timer.ElapsedSeconds()));
if (result != 0)
return UNEXPECTED_ERROR;
@ -221,8 +210,8 @@ BSDiffStatus CreateBinaryPatch(OldReader & old_reader,
scan += match.size;
for (int scsc = scan; scan < new_size; ++scan) {
match = search<decltype(I)>(
I, old, old_size, newbuf + scan, new_size - scan);
match = search<decltype(suffix_array)>(suffix_array, old, old_size, newbuf + scan,
new_size - scan);
for (; scsc < scan + match.size; scsc++)
if ((scsc + lastoffset < old_size) &&
@ -348,7 +337,7 @@ BSDiffStatus CreateBinaryPatch(OldReader & old_reader,
WriteVarUint(diff_skips.GetWriter(), pending_diff_zeros);
I.clear();
suffix_array.clear();
MBSPatchHeader header;
// The string will have a null terminator that we don't use, hence '-1'.

12
3party/bsdiff-courgette/bsdiff/bsdiff_search.h
View file

@ -67,11 +67,11 @@ inline int matchlen(const unsigned char* buf1,
}
// Finds a suffix in |old| that has the longest common prefix with |keybuf|,
// aided by suffix array |I| of |old|. Returns the match length, and writes to
// aided by suffix array |sa| of |old|. Returns the match length, and writes to
// |pos| a position of best match in |old|. If multiple such positions exist,
// |pos| would take an arbitrary one.
template <class T>
SearchResult search(const T & I,
SearchResult search(const T & sa,
const unsigned char* srcbuf,
int srcsize,
const unsigned char* keybuf,
@ -81,15 +81,15 @@ SearchResult search(const T & I,
while (hi - lo > 1) {
int mid = (lo + hi) / 2;
if (std::lexicographical_compare(
srcbuf + I[mid], srcbuf + srcsize, keybuf, keybuf + keysize)) {
srcbuf + sa[mid], srcbuf + srcsize, keybuf, keybuf + keysize)) {
lo = mid;
} else {
hi = mid;
}
}
int x = matchlen(srcbuf + I[lo], keybuf, std::min(srcsize - I[lo], keysize));
int y = matchlen(srcbuf + I[hi], keybuf, std::min(srcsize - I[hi], keysize));
return (x > y) ? SearchResult(I[lo], x) : SearchResult(I[hi], y);
int x = matchlen(srcbuf + sa[lo], keybuf, std::min(srcsize - sa[lo], keysize));
int y = matchlen(srcbuf + sa[hi], keybuf, std::min(srcsize - sa[hi], keysize));
return (x > y) ? SearchResult(sa[lo], x) : SearchResult(sa[hi], y);
}
} // namespace bsdiff

18
generator/mwm_diff/mwm_diff_tests/bsdiff_search_tests.cpp
View file

@ -19,9 +19,9 @@ UNIT_TEST(BSDiffSearchTest_Search)
// 012345678901234567890123456789012345678901234
string const str = "the quick brown fox jumps over the lazy dog.";
int const size = static_cast<int>(str.size());
unsigned char const * const buf = reinterpret_cast<unsigned char const * const>(str.data());
vector<divsuf::saidx_t> I(size + 1);
divsuf::divsufsort_include_empty(buf, I.data(), size);
auto buf = reinterpret_cast<unsigned char const * const>(str.data());
vector<divsuf::saidx_t> suffix_array(size + 1);
divsuf::divsufsort_include_empty(buf, suffix_array.data(), size);
// Specific queries.
struct
@ -63,11 +63,11 @@ UNIT_TEST(BSDiffSearchTest_Search)
{
auto const & testCase = testCases[idx];
int const querySize = static_cast<int>(testCase.m_query_str.size());
unsigned char const * const query_buf =
reinterpret_cast<unsigned char const * const>(testCase.m_query_str.data());
auto query_buf = reinterpret_cast<unsigned char const * const>(testCase.m_query_str.data());
// Perform the search.
bsdiff::SearchResult const match = bsdiff::search<decltype(I)>(I, buf, size, query_buf, querySize);
bsdiff::SearchResult const match =
bsdiff::search<decltype(suffix_array)>(suffix_array, buf, size, query_buf, querySize);
// Check basic properties and match with expected values.
TEST_GREATER_OR_EQUAL(match.size, 0, ());
@ -108,8 +108,8 @@ UNIT_TEST(BSDiffSearchTest_SearchExact)
unsigned char const * const buf =
reinterpret_cast<unsigned char const * const>(testCases[idx].data());
vector<divsuf::saidx_t> I(size + 1);
divsuf::divsufsort_include_empty(buf, I.data(), size);
vector<divsuf::saidx_t> suffix_array(size + 1);
divsuf::divsufsort_include_empty(buf, suffix_array.data(), size);
// Test exact matches for every non-empty substring.
for (int lo = 0; lo < size; ++lo)
@ -122,7 +122,7 @@ UNIT_TEST(BSDiffSearchTest_SearchExact)
unsigned char const * const query_buf =
reinterpret_cast<unsigned char const * const>(query.c_str());
bsdiff::SearchResult const match =
bsdiff::search<decltype(I)>(I, buf, size, query_buf, querySize);
bsdiff::search<decltype(suffix_array)>(suffix_array, buf, size, query_buf, querySize);
TEST_EQUAL(querySize, match.size, ());
TEST_GREATER_OR_EQUAL(match.pos, 0, ());