Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: courgette/third_party/bsdiff/bsdiff_search_unittest.cc

Issue 1948843002: [Courgette Experimental] Replace QSufSort with libdivsufsort Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and merge. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « courgette/third_party/bsdiff/bsdiff_search.h ('k') | courgette/third_party/bsdiff/qsufsort.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: courgette/third_party/bsdiff/bsdiff_search_unittest.cc
diff --git a/courgette/third_party/bsdiff/bsdiff_search_unittest.cc b/courgette/third_party/bsdiff/bsdiff_search_unittest.cc
index dff7172dc5ce31351525295cb2e7a2198f2c81e6..9a761aeddc2b57984ac89d83b355d5135e79f4b7 100644
--- a/courgette/third_party/bsdiff/bsdiff_search_unittest.cc
+++ b/courgette/third_party/bsdiff/bsdiff_search_unittest.cc
@@ -8,7 +8,8 @@
#include <vector>
#include "base/macros.h"
-#include "courgette/third_party/bsdiff/qsufsort.h"
+#include "courgette/third_party/bsdiff/paged_array.h"
+#include "courgette/third_party/divsufsort/divsufsort.h"
#include "testing/gtest/include/gtest/gtest.h"
TEST(BSDiffSearchTest, Search) {
@@ -18,9 +19,10 @@ TEST(BSDiffSearchTest, Search) {
const char* str = "the quick brown fox jumps over the lazy dog.";
int size = static_cast<int>(::strlen(str));
const unsigned char* buf = reinterpret_cast<const unsigned char*>(str);
- std::vector<int> I(size + 1);
- std::vector<int> V(size + 1);
- courgette::qsuf::qsufsort<int*>(&I[0], &V[0], buf, size);
+ courgette::PagedArray<divsuf::saidx_t> I;
+ ASSERT_TRUE(I.Allocate(size + 1));
+ I[0] = size;
+ divsuf::divsufsort(buf, I.begin() + 1, size);
// Specific queries.
const struct {
@@ -66,7 +68,7 @@ TEST(BSDiffSearchTest, Search) {
// Perform the search.
int pos = 0;
int match_size =
- courgette::search(&I[0], buf, size, query_buf, query_size, &pos);
+ bsdiff::search(&I[0], buf, size, query_buf, query_size, &pos);
// Check basic properties and match with expected values.
EXPECT_GE(match_size, 0);
@@ -101,9 +103,10 @@ TEST(BSDiffSearchTest, SearchExact) {
int size = static_cast<int>(::strlen(test_cases[idx]));
const unsigned char* buf =
reinterpret_cast<const unsigned char*>(test_cases[idx]);
- std::vector<int> I(size + 1);
- std::vector<int> V(size + 1);
- courgette::qsuf::qsufsort<int*>(&I[0], &V[0], buf, size);
+ courgette::PagedArray<divsuf::saidx_t> I;
+ ASSERT_TRUE(I.Allocate(size + 1));
+ I[0] = size;
+ divsuf::divsufsort(buf, I.begin() + 1, size);
// Test exact matches for every non-empty substring.
for (int lo = 0; lo < size; ++lo) {
@@ -115,7 +118,7 @@ TEST(BSDiffSearchTest, SearchExact) {
reinterpret_cast<const unsigned char*>(query.c_str());
int pos = 0;
int match_size =
- courgette::search(&I[0], buf, size, query_buf, query_size, &pos);
+ bsdiff::search(&I[0], buf, size, query_buf, query_size, &pos);
EXPECT_EQ(query_size, match_size);
EXPECT_GE(pos, 0);
« no previous file with comments | « courgette/third_party/bsdiff/bsdiff_search.h ('k') | courgette/third_party/bsdiff/qsufsort.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698