From 3c798d869f43e53d24e5a5dd5a2d3b9f349712a0 Mon Sep 17 00:00:00 2001
From: Maged Michael <magedmichael@fb.com>
Date: Tue, 20 Nov 2018 06:32:31 -0800
Subject: [PATCH] ConcurrentHashMap: Temporarily disable destruction order
 guarantee.

Summary: Temporarily disable the use of hazptr_obj_batch until higher-level users adapt to the destruction order policy of completing the destruction of keys and values by the completion of ConcurrentHashMap destructor.

Reviewed By: yfeldblum

Differential Revision: D13136251

fbshipit-source-id: ee2ed21d1825d2609d8f097e878457975d7909e8
---
 folly/concurrency/detail/ConcurrentHashMap-detail.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/folly/concurrency/detail/ConcurrentHashMap-detail.h b/folly/concurrency/detail/ConcurrentHashMap-detail.h
index a1c8f6bd0..975bcea2c 100644
--- a/folly/concurrency/detail/ConcurrentHashMap-detail.h
+++ b/folly/concurrency/detail/ConcurrentHashMap-detail.h
@@ -169,7 +169,12 @@ class NodeT : public hazptr_obj_base_linked<
     DCHECK(batch);
     this->set_deleter( // defined in hazptr_obj
         concurrenthashmap::HazptrDeleter<Allocator>());
-    this->set_batch_tag(batch); // defined in hazptr_obj
+    /* Note: Temporarily commenting out the next line to disable the
+     * use of hazptr_obj_batch until higher-level users adapt to the
+     * destruction order guarantee of completing the destruction of
+     * keys and values by the completion of the destructor of the
+     * associated ConcurrentHashMap. */
+    // this->set_batch_tag(batch); // defined in hazptr_obj
     this->acquire_link_safe(); // defined in hazptr_obj_base_linked
   }
 
-- 
2.26.2