Change htab keys to contain dbid

Author: Alexandra Pervushina

aqo--1.6.sql

@@ -150,7 +150,13 @@ CREATE FUNCTION aqo_reset() RETURNS bigint
 AS 'MODULE_PATHNAME', 'aqo_reset'
 LANGUAGE C PARALLEL SAFE;
 COMMENT ON FUNCTION aqo_reset() IS
-'Reset all data gathered by AQO';
+'Reset all data gathered by AQO for the current database';
+
+CREATE FUNCTION aqo_reset(dbid oid) RETURNS bigint
+AS 'MODULE_PATHNAME', 'aqo_reset'
+LANGUAGE C PARALLEL SAFE;
+COMMENT ON FUNCTION aqo_reset(oid) IS
+'Reset all data gathered by AQO for the specified database';
 
 -- -----------------------------------------------------------------------------
 --
@@ -161,7 +167,6 @@ COMMENT ON FUNCTION aqo_reset() IS
 CREATE FUNCTION aqo_data (
   OUT fs			bigint,
   OUT fss			integer,
-  OUT db_id   Oid,
   OUT nfeatures		integer,
   OUT features		double precision[][],
   OUT targets		double precision[],
@@ -174,7 +179,6 @@ LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
 
 CREATE FUNCTION aqo_queries (
   OUT queryid                bigint,
-  OUT db_id                  Oid,
   OUT fs                     bigint,
   OUT learn_aqo              boolean,
   OUT use_aqo                boolean,
@@ -188,7 +192,6 @@ LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
 
 CREATE FUNCTION aqo_query_stat (
   OUT queryid						bigint,
-  OUT db_id             Oid,
   OUT execution_time_with_aqo		double precision[],
   OUT execution_time_without_aqo	double precision[],
   OUT planning_time_with_aqo		double precision[],
@@ -202,7 +205,7 @@ RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'aqo_query_stat'
 LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
 
-CREATE FUNCTION aqo_query_texts(OUT queryid bigint, OUT dbid Oid, OUT query_text text)
+CREATE FUNCTION aqo_query_texts(OUT queryid bigint, OUT query_text text)
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'aqo_query_texts'
 LANGUAGE C STRICT VOLATILE PARALLEL SAFE;

aqo_shared.c

@@ -60,13 +60,14 @@ aqo_init_shmem(void)
 		LWLockInitialize(&aqo_state->queries_lock, LWLockNewTrancheId());
 	}
 
-	info.keysize = sizeof(((StatEntry *) 0)->queryid);
+	info.keysize = sizeof(stat_key);
+	elog(LOG, "keysize %ld", info.keysize);
 	info.entrysize = sizeof(StatEntry);
 	stat_htab = ShmemInitHash("AQO Stat HTAB", fs_max_items, fs_max_items,
 							  &info, HASH_ELEM | HASH_BLOBS);
 
 	/* Init shared memory table for query texts */
-	info.keysize = sizeof(((QueryTextEntry *) 0)->queryid);
+	info.keysize = sizeof(qtext_key);
 	info.entrysize = sizeof(QueryTextEntry);
 	qtexts_htab = ShmemInitHash("AQO Query Texts HTAB", fs_max_items, fs_max_items,
 								&info, HASH_ELEM | HASH_BLOBS);
@@ -78,7 +79,7 @@ aqo_init_shmem(void)
 							  &info, HASH_ELEM | HASH_BLOBS);
 
 	/* Shared memory hash table for queries */
-	info.keysize = sizeof(((QueriesEntry *) 0)->queryid);
+	info.keysize = sizeof(queries_key);
 	info.entrysize = sizeof(QueriesEntry);
 	queries_htab = ShmemInitHash("AQO Queries HTAB", fs_max_items, fs_max_items,
 								 &info, HASH_ELEM | HASH_BLOBS);