8000 Add oids array into the aqo_data table. · postgrespro/aqo@bdb28d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit bdb28d2

Browse files
danolivoAndrey Lepikhov
danolivo
authored and
Andrey Lepikhov
committed
Add oids array into the aqo_data table.
We could use it for cleaning old ML-data for previously dropped tables.
1 parent e2a1788 commit bdb28d2

File tree

8 files changed

+82
-20
lines changed

8 files changed

+82
-20
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ PG_CPPFLAGS += -I$(libpq_srcdir) -I$(fdw_srcdir)
2727
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
2828
EXTRA_INSTALL = contrib/postgres_fdw
2929

30-
DATA = aqo--1.0.sql aqo--1.0--1.1.sql aqo--1.1--1.2.sql aqo--1.2.sql
30+
DATA = aqo--1.0.sql aqo--1.0--1.1.sql aqo--1.1--1.2.sql aqo--1.2.sql \
31+
aqo--1.2--1.3.sql
3132

3233
ifdef USE_PGXS
3334
PG_CONFIG ?= pg_config

‎aqo--1.2--1.3.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE public.aqo_data ADD COLUMN oids OID [] DEFAULT NULL;

‎aqo.control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# AQO extension
22
comment = 'machine learning for cardinality estimation in optimizer'
3-
default_version = '1.2'
3+
default_version = '1.3'
44
module_pathname = '$libdir/aqo'
55
relocatable = false

‎aqo.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,9 +284,10 @@ extern bool update_query(int qhash, int fhash,
284284
bool learn_aqo, bool use_aqo, bool auto_tuning);
285285
extern bool add_query_text(int query_hash, const char *query_string);
286286
extern bool load_fss(int fhash, int fss_hash,
287-
int ncols, double **matrix, double *targets, int *rows);
287+
int ncols, double **matrix, double *targets, int *rows,
288+
List **relids);
288289
extern bool update_fss(int fhash, int fss_hash, int nrows, int ncols,
289-
double **matrix, double *targets);
290+
double **matrix, double *targets, List *relids);
290291
QueryStat *get_aqo_stat(int query_hash);
291292
void update_aqo_stat(int query_hash, QueryStat * stat);
292293
extern bool my_index_insert(Relation indexRelation, Datum *values, bool *isnull,

‎cardinality_estimation.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ predict_for_relation(List *clauses, List *selectivities,
4141
matrix[i] = palloc0(sizeof(**matrix) * nfeatures);
4242

4343
if (load_fss(query_context.fspace_hash, *fss_hash, nfeatures, matrix,
44-
targets, &rows))
44+
targets, &rows, NULL))
4545
result = OkNNr_predict(rows, nfeatures, matrix, targets, features);
4646
else
4747
{

‎expected/forced_stat_collection.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ SELECT count(*) FROM person WHERE age<18 AND passport IS NOT NULL;
3232
(1 row)
3333

3434
SELECT * FROM aqo_data;
35-
fspace_hash | fsspace_hash | nfeatures | features | targets
36-
-------------+--------------+-----------+----------+---------
35+
fspace_hash | fsspace_hash | nfeatures | features | targets | oids
36+
-------------+--------------+-----------+----------+---------+------
3737
(0 rows)
3838

3939
SELECT learn_aqo,use_aqo,auto_tuning,cardinality_error_without_aqo ce,executions_without_aqo nex

‎postprocessing.c‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ static char *PlanStateInfo = "PlanStateInfo";
4747
/* Query execution statistics collecting utilities */
4848
static void atomic_fss_learn_step(int fhash, int fss_hash, int ncols,
4949
double **matrix, double *targets,
50-
double *features, double target);
50+
double *features, double target,
51+
List *relids);
5152
static void learn_sample(List *clauselist,
5253
List *selectivities,
5354
List *relidslist,
@@ -79,19 +80,20 @@ static void RemoveFromQueryEnv(QueryDesc *queryDesc);
7980
static void
8081
atomic_fss_learn_step(int fhash, int fss_hash, int ncols,
8182
double **matrix, double *targets,
82-
double *features, double target)
83+
double *features, double target,
84+
List *relids)
8385
{
8486
LOCKTAG tag;
8587
int nrows;
8688

8789
init_lock_tag(&tag, (uint32) fhash, (uint32) fss_hash);
8890
LockAcquire(&tag, ExclusiveLock, false, false);
8991

90-
if (!load_fss(fhash, fss_hash, ncols, matrix, targets, &nrows))
92+
if (!load_fss(fhash, fss_hash, ncols, matrix, targets, &nrows, NULL))
9193
nrows = 0;
9294

9395
nrows = OkNNr_learn(nrows, ncols, matrix, targets, features, target);
94-
update_fss(fhash, fss_hash, nrows, ncols, matrix, targets);
96+
update_fss(fhash, fss_hash, nrows, ncols, matrix, targets, relids);
9597

9698
LockRelease(&tag, ExclusiveLock, false);
9799
}
@@ -126,7 +128,7 @@ learn_sample(List *clauselist, List *selectivities, List *relidslist,
126128
return;
127129

128130
if (aqo_log_ignorance && aqo_node->prediction <= 0 &&
129-
load_fss(fhash, fss_hash, 0, NULL, NULL, NULL) )
131+
load_fss(fhash, fss_hash, 0, NULL, NULL, NULL, NULL) )
130132
{
131133
/*
132134
* If ignorance logging is enabled and the feature space was existed in
@@ -141,7 +143,8 @@ learn_sample(List *clauselist, List *selectivities, List *relidslist,
141143

142144
/* Critical section */
143145
atomic_fss_learn_step(fhash, fss_hash,
144-
nfeatures, matrix, targets, features, target);
146+
nfeatures, matrix, targets, features, target,
147+
relidslist);
145148
/* End of critical section */
146149

147150
if (nfeatures > 0)

‎storage.c‎

Lines changed: 63 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,53 @@ add_query_text(int qhash, const char *query_string)
259259
return true;
260260
}
261261

262+
263+
static ArrayType *
264+
form_oids_vector(List *relids)
265+
{
266+
Datum *oids;
267+
ArrayType *array;
268+
ListCell *lc;
269+
int i = 0;
270+
271+
if (relids == NIL)
272+
return NULL;
273+
274+
oids = (Datum *) palloc(list_length(relids) * sizeof(Datum));
275+
276+
foreach(lc, relids)
277+
{
278+
Oid relid = lfirst_oid(lc);
279+
280+
oids[i++] = ObjectIdGetDatum(relid);
281+
}
282+
283+
Assert(i == list_length(relids));
284+
array = construct_array(oids, i, OIDOID, sizeof(Oid), true, TYPALIGN_INT);
285+
pfree(oids);
286+
return array;
287+
}
288+
289+
static List *
290+
deform_oids_vector(Datum datum)
291+
{
292+
ArrayType *array = DatumGetArrayTypePCopy(PG_DETOAST_DATUM(datum));
293+
Datum *values;
294+
int i;
295+
int nelems = 0;
296+
List *relids = NIL;
297+
298+
deconstruct_array(array,
299+
OIDOID, sizeof(Oid), true, TYPALIGN_INT,
300+
&values, NULL, &nelems);
301+
for (i = 0; i < nelems; ++i)
302+
relids = lappend_oid(relids, DatumGetObjectId(values[i]));
303+
304+
pfree(values);
305+
pfree(array);
306+
return relids;
307+
}
308+
262309
/*
263310
* Loads feature subspace (fss) from table aqo_data into memory.
264311
* The last column of the returned matrix is for target values of objects.
@@ -275,7 +322,8 @@ add_query_text(int qhash, const char *query_string)
275322
*/
276323
bool
277324
load_fss(int fhash, int fss_hash,
278-
int ncols, double **matrix, double *targets, int *rows)
325+
int ncols, double **matrix, double *targets, int *rows,
326+
List **relids)
279327
{
280328
RangeVar *rv;
281329
Relation hrel;
@@ -287,8 +335,8 @@ load_fss(int fhash, int fss_hash,
287335
Oid reloid;
288336
IndexScanDesc scan;
289337
ScanKeyData key[2];
290-
Datum values[5];
291-
bool isnull[5];
338+
Datum values[6];
339+
bool isnull[6];
292340
bool success = true;
293341

294342
reloid = RelnameGetRelid("aqo_fss_access_idx");
@@ -330,6 +378,9 @@ load_fss(int fhash, int fss_hash,
330378
< 684D span class=pl-en>deform_matrix(values[3], matrix);
331379

332380
deform_vector(values[4], targets, rows);
381+
382+
if (relids != NULL)
383+
*relids = deform_oids_vector(values[5]);
333384
}
334385
else
335386
elog(ERROR, "unexpected number of features for hash (%d, %d):\
@@ -361,7 +412,7 @@ load_fss(int fhash, int fss_hash,
361412
*/
362413
bool
363414
update_fss(int fhash, int fsshash, int nrows, int ncols,
364-
double **matrix, double *targets)
415+
double **matrix, double *targets, List *relids)
365416
{
366417
RangeVar *rv;
367418
Relation hrel;
@@ -371,9 +422,9 @@ update_fss(int fhash, int fsshash, int nrows, int ncols,
371422
TupleDesc tupDesc;
372423
HeapTuple tuple,
373424
nw_tuple;
374-
Datum values[5];
375-
bool isnull[5] = { false, false, false, false, false };
376-
bool replace[5] = { false, false, false, true, true };
425+
Datum values[6];
426+
bool isnull[6] = { false, false, false, false, false, false };
427+
bool replace[6] = { false, false, false, true, true, false };
377428
bool shouldFree;
378429
bool find_ok = false;
379430
bool update_indexes;
@@ -421,6 +472,11 @@ update_fss(int fhash, int fsshash, int nrows, int ncols,
421472
isnull[3] = true;
422473

423474
values[4] = PointerGetDatum(form_vector(targets, nrows));
475+
476+
/* Form array of relids. Only once. */
477+
values[5] = PointerGetDatum(form_oids_vector(relids));
478+
if ((void *) values[5] == NULL)
479+
isnull[5] = true;
424480
tuple = heap_form_tuple(tupDesc, values, isnull);
425481

426482
/*

0 commit comments

Comments
 (0)
0