From 6ea96b32747d225eac793275c45cca3dca3a2698 Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)"
 <75863576+jeffwashington@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:16:02 -0500
Subject: [PATCH] AcctIdx: grow data buckets to default size on creation
 (#20454)

---
 bucket_map/src/bucket.rs         | 4 ++--
 bucket_map/src/bucket_storage.rs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bucket_map/src/bucket.rs b/bucket_map/src/bucket.rs
index 97cf866b99..758cd0701c 100644
--- a/bucket_map/src/bucket.rs
+++ b/bucket_map/src/bucket.rs
@@ -1,7 +1,7 @@
 use crate::bucket_item::BucketItem;
 use crate::bucket_map::BucketMapError;
 use crate::bucket_stats::BucketMapStats;
-use crate::bucket_storage::{BucketStorage, Uid, UID_UNLOCKED};
+use crate::bucket_storage::{BucketStorage, Uid, DEFAULT_CAPACITY_POW2, UID_UNLOCKED};
 use crate::index_entry::IndexEntry;
 use crate::{MaxSearch, RefCount};
 use rand::thread_rng;
@@ -413,7 +413,7 @@ impl<T: Clone + Copy> Bucket<T> {
             &self.drives,
             self.index.max_search,
             self.data.get(data_index as usize),
-            current_capacity_pow2 + 1,
+            std::cmp::max(current_capacity_pow2 + 1, DEFAULT_CAPACITY_POW2),
             1 << data_index,
             Self::elem_size(),
             &self.stats.data,
diff --git a/bucket_map/src/bucket_storage.rs b/bucket_map/src/bucket_storage.rs
index 811e00ff1a..9313304308 100644
--- a/bucket_map/src/bucket_storage.rs
+++ b/bucket_map/src/bucket_storage.rs
@@ -29,7 +29,7 @@ use std::sync::Arc;
 23  8,388,608
 24  16,777,216
 */
-const DEFAULT_CAPACITY_POW2: u8 = 5;
+pub const DEFAULT_CAPACITY_POW2: u8 = 5;
 
 /// A Header UID of 0 indicates that the header is unlocked
 pub(crate) const UID_UNLOCKED: Uid = 0;