Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b43d987 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Pass max trie structure size to on memory Ver4DictBuffers. 

Bug: 14166482
Bug: 14161647

Change-Id: I3b0dd192d7a81c3809f1873bb66ef8fe637f8af0
parent 1ee443d8

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.cpp

+2 −3
Original line number Diff line number Diff line
@@ -130,11 +130,10 @@ Ver4DictBuffers::Ver4DictBuffers(const char *const dictPath, 
          mShortcutDictContent(dictPath, isUpdatable),

          mIsUpdatable(isUpdatable) {}



Ver4DictBuffers::Ver4DictBuffers(const HeaderPolicy *const headerPolicy)

Ver4DictBuffers::Ver4DictBuffers(const HeaderPolicy *const headerPolicy, const int maxTrieSize)

        : mHeaderBuffer(nullptr), mDictBuffer(nullptr), mHeaderPolicy(),

          mExpandableHeaderBuffer(Ver4DictConstants::MAX_DICTIONARY_SIZE),

          mExpandableTrieBuffer(Ver4DictConstants::MAX_DICTIONARY_SIZE),

          mTerminalPositionLookupTable(),

          mExpandableTrieBuffer(maxTrieSize), mTerminalPositionLookupTable(),

          mProbabilityDictContent(headerPolicy->hasHistoricalInfoOfWords()),

          mBigramDictContent(headerPolicy->hasHistoricalInfoOfWords()), mShortcutDictContent(),

          mIsUpdatable(true) {}

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_dict_buffers.h

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ class Ver4DictBuffers { 
            MmappedBuffer::MmappedBufferPtr headerBuffer);



    static AK_FORCE_INLINE Ver4DictBuffersPtr createVer4DictBuffers(

            const HeaderPolicy *const headerPolicy) {

        return Ver4DictBuffersPtr(new Ver4DictBuffers(headerPolicy));

            const HeaderPolicy *const headerPolicy, const int maxTrieSize) {

        return Ver4DictBuffersPtr(new Ver4DictBuffers(headerPolicy, maxTrieSize));

    }



    AK_FORCE_INLINE bool isValid() const {
@@ -122,7 +122,7 @@ class Ver4DictBuffers { 
    Ver4DictBuffers(const char *const dictDirPath,

            const MmappedBuffer::MmappedBufferPtr headerBuffer, const bool isUpdatable);



    Ver4DictBuffers(const HeaderPolicy *const headerPolicy);

    Ver4DictBuffers(const HeaderPolicy *const headerPolicy, const int maxTrieSize);



    const MmappedBuffer::MmappedBufferPtr mHeaderBuffer;

    const MmappedBuffer::MmappedBufferPtr mDictBuffer;

native/jni/src/suggest/policyimpl/dictionary/structure/v4/ver4_patricia_trie_writing_helper.cpp

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ bool Ver4PatriciaTrieWritingHelper::writeToDictFileWithGC(const int rootPtNodeAr 
        const char *const dictDirPath) {

    const HeaderPolicy *const headerPolicy = mBuffers->getHeaderPolicy();

    Ver4DictBuffers::Ver4DictBuffersPtr dictBuffers(

            Ver4DictBuffers::createVer4DictBuffers(headerPolicy));

            Ver4DictBuffers::createVer4DictBuffers(headerPolicy,

                    Ver4DictConstants::MAX_DICTIONARY_SIZE));

    int unigramCount = 0;

    int bigramCount = 0;

    if (!runGC(rootPtNodeArrayPos, headerPolicy, dictBuffers.get(), &unigramCount, &bigramCount)) {

native/jni/src/suggest/policyimpl/dictionary/utils/dict_file_writing_utils.cpp

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ const char *const DictFileWritingUtils::TEMP_FILE_SUFFIX_FOR_WRITING_DICT_FILE = 
        const DictionaryHeaderStructurePolicy::AttributeMap *const attributeMap) {

    HeaderPolicy headerPolicy(FormatUtils::VERSION_4, localeAsCodePointVector, attributeMap);

    Ver4DictBuffers::Ver4DictBuffersPtr dictBuffers(

            Ver4DictBuffers::createVer4DictBuffers(&headerPolicy));

            Ver4DictBuffers::createVer4DictBuffers(&headerPolicy,

                    Ver4DictConstants::MAX_DICT_EXTENDED_REGION_SIZE));

    headerPolicy.fillInAndWriteHeaderToBuffer(true /* updatesLastDecayedTime */,

            0 /* unigramCount */, 0 /* bigramCount */,

            0 /* extendedRegionSize */, dictBuffers->getWritableHeaderBuffer());