Fix test; change order of output params

Author: Alexandra Pervushina

aqo--1.6.sql

@@ -167,48 +167,48 @@ COMMENT ON FUNCTION aqo_reset(oid) IS
 CREATE FUNCTION aqo_data (
   OUT fs			bigint,
   OUT fss			integer,
-  OUT dbid    Oid,
   OUT nfeatures		integer,
   OUT features		double precision[][],
   OUT targets		double precision[],
   OUT reliability	double precision[],
-  OUT oids			Oid[]
+  OUT oids			Oid[],
+  OUT dbid		bigint
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'aqo_data'
 LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
 
 CREATE FUNCTION aqo_queries (
   OUT queryid                bigint,
-  OUT dbid                   Oid,
   OUT fs                     bigint,
   OUT learn_aqo              boolean,
   OUT use_aqo                boolean,
   OUT auto_tuning            boolean,
   OUT smart_timeout          bigint,
-  OUT count_increase_timeout bigint
+  OUT count_increase_timeout bigint,
+  OUT dbid                   bigint
 )
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'aqo_queries'
 LANGUAGE C STRICT VOLATILE PARALLEL SAFE;
 
 CREATE FUNCTION aqo_query_stat (
   OUT queryid						bigint,
-  OUT dbid              oid,
   OUT execution_time_with_aqo		double precision[],
   OUT execution_time_without_aqo	double precision[],
   OUT planning_time_with_aqo		double precision[],
   OUT planning_time_without_aqo		double precision[],
   OUT cardinality_error_with_aqo	double precision[],
   OUT cardinality_error_without_aqo	double precision[],
   OUT executions_with_aqo bigint,
-  OUT executions_without_aqo		bigint
+  OUT executions_without_aqo		bigint,
+  OUT dbid                   bigint
 )
 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, OUT dbid bigint)
 RETURNS SETOF record
 AS 'MODULE_PATHNAME', 'aqo_query_texts'
 LANGUAGE C STRICT VOLATILE PARALLEL SAFE;

sql/multiple_databases.sql

@@ -37,7 +37,7 @@ SELECT x1,y1 FROM A LEFT JOIN b ON A.x1 = B.y1 WHERE x1 = 5 AND x2 = 5;') AS str
 WHERE str NOT LIKE 'Query Identifier%' and str NOT LIKE '%Memory%' and str NOT LIKE '%Sort Method%';
 
 SELECT count(*) FROM aqo_data();
-SELECT count(*) FROM aqo_queries;();
+SELECT count(*) FROM aqo_queries();
 SELECT count(*) FROM aqo_query_texts();
 SELECT count(*) FROM aqo_query_stat();
 
@@ -49,20 +49,35 @@ set aqo.join_threshold = 0;
 set aqo.show_details = on;
 set aqo.mode = learn;
 set aqo.use = on;
-select * from aqo_reset(NULL);
 
--- Only see info from current database.
+CREATE TABLE a (x1 int, x2 int, x3 int);
+INSERT INTO a (x1, x2, x3) SELECT mod(ival,10), mod(ival,10), mod(ival,10) FROM generate_series(1,100) As ival;
+
+CREATE OR REPLACE FUNCTION expln(query_string text) RETURNS SETOF text AS $$
+BEGIN
+    RETURN QUERY
+        EXECUTE format('EXPLAIN (ANALYZE, VERBOSE, COSTS OFF, TIMING OFF, SUMMARY OFF) %s', query_string);
+    RETURN;
+END;
+$$ LANGUAGE PLPGSQL;
+
+SELECT str AS result
+FROM expln('
+SELECT * FROM a WHERE x1 > 1;') AS str
+WHERE str NOT LIKE 'Query Identifier%' and str NOT LIKE '%Memory%' and str NOT LIKE '%Sort Method%';
+
 SELECT count(*) FROM aqo_data();
-SELECT count(*) FROM aqo_queries;();
+SELECT count(*) FROM aqo_queries();
 SELECT count(*) FROM aqo_query_texts();
 SELECT count(*) FROM aqo_query_stat();
--- Remove plan from other DB.
+
+-- Remove aqo info from other DB.
 SELECT aqo_reset(:old_dbid);
 
 -- Reconnect to old DB.
 \c :old_db - - :old_port
 SELECT count(*) FROM aqo_data();
-SELECT count(*) FROM aqo_queries;();
+SELECT count(*) FROM aqo_queries();
 SELECT count(*) FROM aqo_query_texts();
 SELECT count(*) FROM aqo_query_stat();
 SELECT aqo_reset(NULL);

storage.c

@@ -41,22 +41,22 @@
 
 
 typedef enum {
-	QUERYID = 0, DBID, EXEC_TIME_AQO, EXEC_TIME, PLAN_TIME_AQO, PLAN_TIME,
-	EST_ERROR_AQO, EST_ERROR, NEXECS_AQO, NEXECS, TOTAL_NCOLS
+	QUERYID = 0, EXEC_TIME_AQO, EXEC_TIME, PLAN_TIME_AQO, PLAN_TIME,
+	EST_ERROR_AQO, EST_ERROR, NEXECS_AQO, NEXECS, DBID, TOTAL_NCOLS
 } aqo_stat_cols;
 
 typedef enum {
-	QT_QUERYID = 0, QT_DBID, QT_QUERY_STRING, QT_TOTAL_NCOLS
+	QT_QUERYID = 0, QT_QUERY_STRING, QT_DBID, QT_TOTAL_NCOLS
 } aqo_qtexts_cols;
 
 typedef enum {
-	AD_FS = 0, AD_FSS, AD_DBID, AD_NFEATURES, AD_FEATURES, AD_TARGETS, AD_RELIABILITY,
-	AD_OIDS, AD_TOTAL_NCOLS
+	AD_FS = 0, AD_FSS, AD_NFEATURES, AD_FEATURES, AD_TARGETS, AD_RELIABILITY,
+	AD_OIDS, AD_DBID, AD_TOTAL_NCOLS
 } aqo_data_cols;
 
 typedef enum {
-	AQ_QUERYID = 0, AQ_DBID, AQ_FS, AQ_LEARN_AQO, AQ_USE_AQO, AQ_AUTO_TUNING, AQ_SMART_TIMEOUT, AQ_COUNT_INCREASE_TIMEOUT,
-	AQ_TOTAL_NCOLS
+	AQ_QUERYID = 0, AQ_FS, AQ_LEARN_AQO, AQ_USE_AQO, AQ_AUTO_TUNING, AQ_SMART_TIMEOUT, AQ_COUNT_INCREASE_TIMEOUT,
+	AQ_DBID, AQ_TOTAL_NCOLS
 } aqo_queries_cols;
 
 typedef void* (*form_record_t) (void *ctx, size_t *size);
@@ -424,7 +424,7 @@ aqo_query_stat(PG_FUNCTION_ARGS)
 	while ((entry = hash_seq_search(&hash_seq)) != NULL)
 	{
 		values[QUERYID] = Int64GetDatum(entry->key.queryid);
-		values[DBID] = ObjectIdGetDatum(entry->key.dbid);
+		values[DBID] = UInt64GetDatum(entry->key.dbid);
 		values[NEXECS] = Int64GetDatum(entry->execs_without_aqo);
 		values[NEXECS_AQO] = Int64GetDatum(entry->execs_with_aqo);
 		values[EXEC_TIME_AQO] = PointerGetDatum(form_vector(entry->exec_time_aqo, entry->cur_stat_slot_aqo));
@@ -1202,7 +1202,6 @@ aqo_query_texts(PG_FUNCTION_ARGS)
 		Assert(DsaPointerIsValid(entry->qtext_dp));
 		ptr = dsa_get_address(qtext_dsa, entry->qtext_dp);
 		values[QT_QUERYID] = Int64GetDatum(entry->key.queryid);
-		values[QT_DBID] = ObjectIdGetDatum(entry->key.dbid);
 		values[QT_QUERY_STRING] = CStringGetTextDatum(ptr);
 		tuplestore_putvalues(tupstore, tupDesc, values, nulls);
 	}
@@ -1829,7 +1828,7 @@ aqo_data(PG_FUNCTION_ARGS)
 
 		values[AD_FS] = Int64GetDatum(entry->key.fs);
 		values[AD_FSS] = Int32GetDatum((int) entry->key.fss);
-		values[AD_DBID] = ObjectIdGetDatum(entry->key.dbid);
+		values[AD_DBID] = UInt64GetDatum(entry->key.dbid);
 		values[AD_NFEATURES] = Int32GetDatum(entry->cols);
 
 		/* Fill values from the DSA data chunk */
@@ -1991,7 +1990,7 @@ aqo_queries(PG_FUNCTION_ARGS)
 	while ((entry = hash_seq_search(&hash_seq)) != NULL)
 	{
 		values[AQ_QUERYID] = Int64GetDatum(entry->key.queryid);
-		values[AQ_DBID] = ObjectIdGetDatum(entry->key.dbid);
+		values[AQ_DBID] = UInt64GetDatum(entry->key.dbid);
 		values[AQ_FS] = Int64GetDatum(entry->fs);
 		values[AQ_LEARN_AQO] = BoolGetDatum(entry->learn_aqo);
 		values[AQ_USE_AQO] = BoolGetDatum(entry->use_aqo);
@@ -2345,9 +2344,6 @@ cleanup_aqo_database(bool gentle, int *fs_num, int *fss_num)
 		List		   *actual_fss = NIL;
 		ListCell	   *lc;
 
-		if (entry->key.dbid != (uint64) MyDatabaseId && entry->key.queryid != 0)
-			continue;
-
 		/* Scan aqo_data for any junk records related to this FS */
 		hash_seq_init(&hash_seq2, data_htab);
 		while ((dentry = hash_seq_search(&hash_seq2)) != NULL)
@@ -2751,14 +2747,14 @@ aqo_query_texts_update(PG_FUNCTION_ARGS)
 	bool	res = false;
 
 	/* Do nothing if any arguments are NULLs */
-	if ((PG_ARGISNULL(QT_QUERYID) || PG_ARGISNULL(QT_QUERY_STRING)))
+	if ((PG_ARGISNULL(0) || PG_ARGISNULL(1)))
 		PG_RETURN_BOOL(false);
 
-	if (!(queryid = PG_GETARG_INT64(QT_QUERYID)))
+	if (!(queryid = PG_GETARG_INT64(0)))
 		/* Do nothing for default feature space */
 		PG_RETURN_BOOL(false);
 
-	str = PG_GETARG_TEXT_PP(QT_QUERY_STRING);
+	str = PG_GETARG_TEXT_PP(1);
 	str_len = VARSIZE_ANY_EXHDR(str) + 1;
 	if (str_len > querytext_max_size)
 		str_len = querytext_max_size;