Merge branch 'PGPROEE10_aqo' into PGPROEE10

Author: vbwagner

contrib/aqo/machine_learning.c

@@ -116,14 +116,14 @@ OkNNr_predict(int matrix_rows, int matrix_cols,
 		if (idx[i] != -1)
 			result += targets[idx[i]] * w[i] / w_sum;
 
-	pfree(distances);
-	pfree(idx);
-	pfree(w);
-
 	/* this should never happen */
 	if (idx[0] == -1)
 		return -1;
 
+	pfree(distances);
+	pfree(idx);
+	pfree(w);
+
 	if (result < 0)
 		result = 0;
 	return result;

contrib/aqo/storage.c

@@ -575,10 +575,11 @@ init_deactivated_queries_storage(void)
 	MemSet(&hash_ctl, 0, sizeof(hash_ctl));
 	hash_ctl.keysize = sizeof(int);
 	hash_ctl.entrysize = sizeof(int);
+	hash_ctl.hash = uint32_hash;
 	deactivated_queries = hash_create("aqo_deactivated_queries",
 									  128,		/* start small and extend */
 									  &hash_ctl,
-									  HASH_ELEM);
+									  HASH_ELEM | HASH_FUNCTION);
 }
 
 /* Destroys the storage for hash of deactivated queries */