am 0db136e5: Merge "Add method to remove entry from language model dict content."

* commit '0db136e51f8fe3950a7badd9fd1ef34e88e9076b':
  Add method to remove entry from language model dict content.

1 files changed, 5 insertions, 1 deletions

diff --git a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
index e630aba9a..944a59c52 100644
--- a/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
+++ b/native/jni/src/suggest/policyimpl/dictionary/utils/trie_map.cpp
@@ -420,6 +420,10 @@ bool TrieMap::addNewEntryByExpandingTable(const uint32_t key, const uint64_t val
 
 bool TrieMap::removeInner(const Entry &bitmapEntry) {
     const int tableSize = popCount(bitmapEntry.getBitmap());
+    if (tableSize <= 0) {
+        // The table is empty. No need to remove any entries.
+        return true;
+    }
     for (int i = 0; i < tableSize; ++i) {
         const int entryIndex = bitmapEntry.getTableIndex() + i;
         const Entry entry = readEntry(entryIndex);
@@ -444,7 +448,7 @@ bool TrieMap::removeInner(const Entry &bitmapEntry) {
             }
         }
     }
-    return freeTable(bitmapEntry.getTableIndex(), tableSize);
+    return true;
 }
 
 }  // namespace latinime