summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@online.no>2024-04-15 23:55:51 +0200
committerTor Egge <Tor.Egge@online.no>2024-04-15 23:55:51 +0200
commit68d2a130c8780a4a55b84e8cadd977a80efa5bab (patch)
tree42c33d7400ef777cf34bbe2d94b063b484377b95
parent0e569bed995a09bcb4da5265182c517d89f1f6cf (diff)
Handle disk index dictionary .ssdat file being larger than 32 GiB.
-rw-r--r--searchlib/src/tests/diskindex/pagedict4/pagedict4_long_words_test.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/util/comprfile.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/util/comprfile.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/searchlib/src/tests/diskindex/pagedict4/pagedict4_long_words_test.cpp b/searchlib/src/tests/diskindex/pagedict4/pagedict4_long_words_test.cpp
index ec822e58fd7..10eee82d6d4 100644
--- a/searchlib/src/tests/diskindex/pagedict4/pagedict4_long_words_test.cpp
+++ b/searchlib/src/tests/diskindex/pagedict4/pagedict4_long_words_test.cpp
@@ -49,7 +49,7 @@ make_word(int i)
*/
TEST(PageDict4LongWordsTest, test_many_long_words)
{
- int num_words = 4_Mi;
+ int num_words = 9_Mi;
auto counts = make_counts();
std::filesystem::remove_all(std::filesystem::path(test_dir));
std::filesystem::create_directories(std::filesystem::path(test_dir));
diff --git a/searchlib/src/vespa/searchlib/util/comprfile.cpp b/searchlib/src/vespa/searchlib/util/comprfile.cpp
index 9d917918dab..db8fe14d658 100644
--- a/searchlib/src/vespa/searchlib/util/comprfile.cpp
+++ b/searchlib/src/vespa/searchlib/util/comprfile.cpp
@@ -346,7 +346,7 @@ ComprFileReadContext::setPosition(uint64_t newPosition)
}
void
-ComprFileReadContext::allocComprBuf(unsigned int comprBufSize, size_t preferredFileAlignment)
+ComprFileReadContext::allocComprBuf(size_t comprBufSize, size_t preferredFileAlignment)
{
ComprBuffer::allocComprBuf(comprBufSize, preferredFileAlignment, _file, true);
}
diff --git a/searchlib/src/vespa/searchlib/util/comprfile.h b/searchlib/src/vespa/searchlib/util/comprfile.h
index 4140425dc68..6a0b72ce7e5 100644
--- a/searchlib/src/vespa/searchlib/util/comprfile.h
+++ b/searchlib/src/vespa/searchlib/util/comprfile.h
@@ -105,7 +105,7 @@ public:
void readComprBuffer(uint64_t stopOffset, bool readAll);
void readComprBuffer();
void setPosition(uint64_t newPosition);
- void allocComprBuf(unsigned int comprBufSize, size_t preferredFileAlignment);
+ void allocComprBuf(size_t comprBufSize, size_t preferredFileAlignment);
void setDecodeContext(ComprFileDecodeContext *decodeContext) { _decodeContext = decodeContext; }
ComprFileDecodeContext *getDecodeContext() const { return _decodeContext; }
void setFile(FastOS_FileInterface *file) { _file = file; }