r

Author: mymeiyi

be/src/olap/tablet_meta.cpp

@@ -1321,7 +1321,7 @@ std::shared_ptr<roaring::Roaring> DeleteBitmap::get_agg(const BitmapKey& bmk) co
             handle == nullptr
                     ? nullptr
                     : reinterpret_cast<AggCache::Value*>(_agg_cache->repr()->value(handle));
-    Cache::Handle* handle2 = nullptr;
+    // Cache::Handle* handle2 = nullptr;
     // FIXME: do we need a mutex here to get rid of duplicated initializations
     //        of cache entries in some cases?
     if (val == nullptr) { // Renew if needed, put a new Value to cache
@@ -1331,12 +1331,14 @@ std::shared_ptr<roaring::Roaring> DeleteBitmap::get_agg(const BitmapKey& bmk) co
             BitmapKey agg_bmk = {std::get<0>(bmk), std::get<1>(bmk), start_version};
             std::string agg_key_str = agg_cache_key(_tablet_id, agg_bmk); // Cache key container
             CacheKey agg_key2(agg_key_str);
-            handle2 = _agg_cache->repr()->lookup(agg_key2);
+            Cache::Handle* handle2 = _agg_cache->repr()->lookup(agg_key2);
             if (handle2 == nullptr) {
                 start_version = 0;
                 // val = new AggCache::Value();
             } else {
-                val = reinterpret_cast<AggCache::Value*>(_agg_cache->repr()->value(handle2));
+                auto val2 = reinterpret_cast<AggCache::Value*>(_agg_cache->repr()->value(handle2));
+                val->bitmap |= val2->bitmap;
+                _agg_cache->repr()->release(handle2);
             }
             LOG(INFO) << "sout: start agg for tablet=" << _tablet_id
                       << ", rowset=" << std::get<0>(bmk).to_string()

cit.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+git add .
+git commit -m "r"
+git log -1
+git push origin delete-dm-when-compact-0312
+