Refactoring of makePackHTAB()

CherkashinSergey · za-arthur · commit 49c8a931c245 · 2018-12-25T13:34:10.000+03:00
diff --git a/pg_variables.c b/pg_variables.c
@@ -1247,32 +1247,25 @@ ensurePackagesHashExists(void)
 static void
 makePackHTAB(Package *package, bool is_trans)
 {
-	HASHCTL		ctl;
-	char		hash_name[BUFSIZ];
+	HASHCTL			ctl;
+	char			hash_name[BUFSIZ];
+	HTAB		  **htab;
+	MemoryContext  *context;
 
-	if (is_trans)
-		package->hctxTransact = AllocSetContextCreate(ModuleContext,
-													  PGV_MCXT_VARS,
-													  ALLOCSET_DEFAULT_SIZES);
-	else
-		package->hctxRegular = AllocSetContextCreate(ModuleContext,
-													 PGV_MCXT_VARS,
-													 ALLOCSET_DEFAULT_SIZES);
+	htab = is_trans ? &package->varHashTransact : &package->varHashRegular;
+	context = is_trans ? &package->hctxTransact : &package->hctxRegular;
+
+	*context = AllocSetContextCreate(ModuleContext, PGV_MCXT_VARS,
+									 ALLOCSET_DEFAULT_SIZES);
 
 	snprintf(hash_name, BUFSIZ, "%s variables hash for package \"%s\"",
 			 is_trans ? "Transactional" : "Regular", GetName(package));
 	ctl.keysize = NAMEDATALEN;
 	ctl.entrysize = sizeof(Variable);
-	ctl.hcxt = (is_trans ? package->hctxTransact : package->hctxRegular);
+	ctl.hcxt = *context;
 
-	if (is_trans)
-		package->varHashTransact = hash_create(hash_name,
-											   NUMVARIABLES, &ctl,
-											   HASH_ELEM | HASH_CONTEXT);
-	else
-		package->varHashRegular = hash_create(hash_name,
-											  NUMVARIABLES, &ctl,
-											  HASH_ELEM | HASH_CONTEXT);
+	*htab = hash_create(hash_name, NUMVARIABLES, &ctl,
+						HASH_ELEM | HASH_CONTEXT);
 }
 
 static Package *
