From f06557689f33d9b11be1083362fcce19665b4014 Mon Sep 17 00:00:00 2001
From: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Thu, 16 Feb 2023 12:18:22 +0900
Subject: [PATCH v2899 2/2] Small improvements for radixtree and tests.

---
 src/include/lib/radixtree.h                      |  2 +-
 src/test/modules/test_radixtree/test_radixtree.c | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/include/lib/radixtree.h b/src/include/lib/radixtree.h
index 1cdb995e54..e546bd705c 100644
--- a/src/include/lib/radixtree.h
+++ b/src/include/lib/radixtree.h
@@ -1622,7 +1622,7 @@ RT_SET(RT_RADIX_TREE *tree, uint64 key, RT_VALUE_TYPE *value_p)
 	/* Descend the tree until we reach a leaf node */
 	while (shift >= 0)
 	{
-		RT_PTR_ALLOC new_child = RT_INVALID_PTR_ALLOC;;
+		RT_PTR_ALLOC new_child = RT_INVALID_PTR_ALLOC;
 
 		child = RT_PTR_GET_LOCAL(tree, stored_child);
 
diff --git a/src/test/modules/test_radixtree/test_radixtree.c b/src/test/modules/test_radixtree/test_radixtree.c
index f944945db9..afe53382f3 100644
--- a/src/test/modules/test_radixtree/test_radixtree.c
+++ b/src/test/modules/test_radixtree/test_radixtree.c
@@ -107,13 +107,12 @@ static const test_spec test_specs[] = {
 
 /* define the radix tree implementation to test */
 #define RT_PREFIX rt
-#define RT_SCOPE static
+#define RT_SCOPE
 #define RT_DECLARE
 #define RT_DEFINE
 #define RT_USE_DELETE
 #define RT_VALUE_TYPE TestValueType
-// WIP: compiles with warnings because rt_attach is defined but not used
-// #define RT_SHMEM
+/* #define RT_SHMEM */
 #include "lib/radixtree.h"
 
 
@@ -142,6 +141,8 @@ test_empty(void)
 #ifdef RT_SHMEM
 	int			tranche_id = LWLockNewTrancheId();
 	dsa_area   *dsa;
+
+	LWLockRegisterTranche(tranche_id, "test_radix_tree");
 	dsa = dsa_create(tranche_id);
 
 	radixtree = rt_create(CurrentMemoryContext, dsa, tranche_id);
@@ -188,6 +189,8 @@ test_basic(int children, bool test_inner)
 #ifdef RT_SHMEM
 	int			tranche_id = LWLockNewTrancheId();
 	dsa_area   *dsa;
+
+	LWLockRegisterTranche(tranche_id, "test_radix_tree");
 	dsa = dsa_create(tranche_id);
 #endif
 
@@ -358,6 +361,8 @@ test_node_types(uint8 shift)
 #ifdef RT_SHMEM
 	int			tranche_id = LWLockNewTrancheId();
 	dsa_area   *dsa;
+
+	LWLockRegisterTranche(tranche_id, "test_radix_tree");
 	dsa = dsa_create(tranche_id);
 #endif
 
@@ -406,6 +411,8 @@ test_pattern(const test_spec * spec)
 #ifdef RT_SHMEM
 	int			tranche_id = LWLockNewTrancheId();
 	dsa_area   *dsa;
+
+	LWLockRegisterTranche(tranche_id, "test_radix_tree");
 	dsa = dsa_create(tranche_id);
 #endif
 
-- 
2.31.1

