Skip to content

Commit 1c42ba9

Browse files
funbringerdanolivo
funbringer
authored and
danolivo
committed
provide solid upgrade to 1.1
1 parent 6aafe3a commit 1c42ba9

File tree

5 files changed

+97
-36
lines changed

5 files changed

+97
-36
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ regression.out
77
*.gcno
88
*.gcov
99
tags
10+
11+
aqo--?.?.sql

‎Makefile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
# contrib/aqo/Makefile
22

33
EXTENSION = aqo
4+
EXTVERSION = 1.1
45
PGFILEDESC = "AQO - adaptive query optimization"
56
MODULES = aqo
6-
DATA = aqo--1.0.sql
77
OBJS = aqo.o auto_tuning.o cardinality_estimation.o cardinality_hooks.o \
88
hash.o machine_learning.o path_utils.o postprocessing.o preprocessing.o \
99
selectivity_cache.o storage.o utils.o $(WIN32RES)
1010

1111
REGRESS = aqo_disabled aqo_controlled aqo_intelligent aqo_forced aqo_learn
12-
EXTRA_REGRESS_OPTS=--temp-config=$(CURDIR)/conf.add
12+
EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
13+
14+
DATA = aqo--1.0.sql aqo--1.0--1.1.sql
15+
DATA_built = aqo--$(EXTVERSION).sql
1316

1417
MODULE_big = aqo
1518
ifdef USE_PGXS
@@ -22,3 +25,7 @@ top_builddir = ../..
2225
include $(top_builddir)/src/Makefile.global
2326
include $(top_srcdir)/contrib/contrib-global.mk
2427
endif
28+
29+
30+
$(DATA_built): $(DATA)
31+
cat $(DATA) > $(DATA_built)

‎aqo--1.0--1.1.sql‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
ALTER TABLE aqo_query_texts ALTER COLUMN query_text TYPE text;
2+
3+
4+
DROP INDEX aqo_query_texts_query_hash_idx CASCADE;
5+
DROP INDEX aqo_queries_query_hash_idx CASCADE;
6+
DROP INDEX aqo_query_stat_idx CASCADE;
7+
DROP INDEX aqo_fss_access_idx CASCADE;
8+
9+
CREATE UNIQUE INDEX aqo_fss_access_idx ON aqo_data (fspace_hash, fsspace_hash);
10+
11+
12+
CREATE OR REPLACE FUNCTION aqo_migrate_to_1_1_get_pk(rel regclass) RETURNS regclass AS $$
13+
DECLARE
14+
idx regclass;
15+
BEGIN
16+
SELECT i.indexrelid FROM pg_catalog.pg_index i JOIN
17+
pg_catalog.pg_attribute a ON a.attrelid = i.indrelid AND
18+
a.attnum = ANY(i.indkey)
19+
WHERE i.indrelid = rel AND
20+
i.indisprimary
21+
INTO idx;
22+
23+
RETURN idx;
24+
END
25+
$$ LANGUAGE plpgsql;
26+
27+
28+
DO $$
29+
BEGIN
30+
EXECUTE format('ALTER TABLE %s RENAME to %s',
31+
aqo_migrate_to_1_1_get_pk('aqo_queries'),
32+
'aqo_queries_query_hash_idx');
33+
34+
EXECUTE format('ALTER TABLE %s RENAME to %s',
35+
aqo_migrate_to_1_1_get_pk('aqo_query_texts'),
36+
'aqo_query_texts_query_hash_idx');
37+
38+
EXECUTE format('ALTER TABLE %s RENAME to %s',
39+
aqo_migrate_to_1_1_get_pk('aqo_query_stat'),
40+
'aqo_query_stat_idx');
41+
END
42+
$$;
43+
44+
45+
DROP FUNCTION aqo_migrate_to_1_1_get_pk(regclass);

‎aqo--1.0.sql‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,58 @@
22
\echo Use "CREATE EXTENSION aqo" to load this file. \quit
33

44
CREATE TABLE aqo_queries (
5-
query_hash int4 CONSTRAINT "aqo_queries_query_hash_idx"
6-
PRIMARY KEY,
7-
learn_aqo bool NOT NULL,
8-
use_aqo bool NOT NULL,
9-
fspace_hash int4 NOT NULL,
10-
auto_tuning bool NOT NULL
5+
query_hash int PRIMARY KEY,
6+
learn_aqo boolean NOT NULL,
7+
use_aqo boolean NOT NULL,
8+
fspace_hash int NOT NULL,
9+
auto_tuning boolean NOT NULL
1110
);
1211

1312
CREATE TABLE aqo_query_texts (
14-
query_hash int4 CONSTRAINT "aqo_query_texts_query_hash_idx"
15-
PRIMARY KEY REFERENCES aqo_queries ON DELETE CASCADE,
16-
query_text text NOT NULL
13+
query_hash int PRIMARY KEY REFERENCES aqo_queries ON DELETE CASCADE,
14+
query_text varchar NOT NULL
1715
);
1816

1917
CREATE TABLE aqo_query_stat (
20-
query_hash int4 CONSTRAINT "aqo_query_stat_idx"
21-
PRIMARY KEY REFERENCES aqo_queries ON DELETE CASCADE,
22-
execution_time_with_aqo float8[],
23-
execution_time_without_aqo float8[],
24-
planning_time_with_aqo float8[],
25-
planning_time_without_aqo float8[],
26-
cardinality_error_with_aqo float8[],
27-
cardinality_error_without_aqo float8[],
28-
executions_with_aqo int8,
29-
executions_without_aqo int8
18+
query_hash int PRIMARY KEY REFERENCES aqo_queries ON DELETE CASCADE,
19+
execution_time_with_aqo double precision[],
20+
execution_time_without_aqo double precision[],
21+
planning_time_with_aqo double precision[],
22+
planning_time_without_aqo double precision[],
23+
cardinality_error_with_aqo double precision[],
24+
cardinality_error_without_aqo double precision[],
25+
executions_with_aqo bigint,
26+
executions_without_aqo bigint
3027
);
3128

3229
CREATE TABLE aqo_data (
33-
fspace_hash int4 NOT NULL REFERENCES aqo_queries ON DELETE CASCADE,
34-
fsspace_hash int4 NOT NULL,
35-
nfeatures int4 NOT NULL,
36-
features float8[][],
37-
targets float8[]
30+
fspace_hash int NOT NULL REFERENCES aqo_queries ON DELETE CASCADE,
31+
fsspace_hash int NOT NULL,
32+
nfeatures int NOT NULL,
33+
features double precision[][],
34+
targets double precision[],
35+
UNIQUE (fspace_hash, fsspace_hash)
3836
);
3937

40-
CREATE UNIQUE INDEX aqo_fss_access_idx ON aqo_data (fspace_hash, fsspace_hash);
38+
CREATE INDEX aqo_queries_query_hash_idx ON aqo_queries (query_hash);
39+
CREATE INDEX aqo_query_texts_query_hash_idx ON aqo_query_texts (query_hash);
40+
CREATE INDEX aqo_query_stat_idx ON aqo_query_stat (query_hash);
41+
CREATE INDEX aqo_fss_access_idx ON aqo_data (fspace_hash, fsspace_hash);
4142

42-
ALTER TABLE aqo_data ALTER COLUMN features SET STORAGE MAIN;
43-
ALTER TABLE aqo_data ALTER COLUMN targets SET STORAGE MAIN;
44-
ALTER TABLE aqo_query_stat ALTER COLUMN execution_time_with_aqo SET STORAGE MAIN;
45-
ALTER TABLE aqo_query_stat ALTER COLUMN execution_time_without_aqo SET STORAGE MAIN;
46-
ALTER TABLE aqo_query_stat ALTER COLUMN planning_time_with_aqo SET STORAGE MAIN;
47-
ALTER TABLE aqo_query_stat ALTER COLUMN planning_time_without_aqo SET STORAGE MAIN;
48-
ALTER TABLE aqo_query_stat ALTER COLUMN cardinality_error_without_aqo SET STORAGE MAIN;
49-
ALTER TABLE aqo_query_stat ALTER COLUMN cardinality_error_with_aqo SET STORAGE MAIN;
43+
ALTER TABLE aqo_data ALTER COLUMN features SET STORAGE MAIN;
44+
ALTER TABLE aqo_data ALTER COLUMN targets SET STORAGE MAIN;
45+
ALTER TABLE aqo_query_stat
46+
ALTER COLUMN execution_time_with_aqo SET STORAGE MAIN;
47+
ALTER TABLE aqo_query_stat
48+
ALTER COLUMN execution_time_without_aqo SET STORAGE MAIN;
49+
ALTER TABLE aqo_query_stat
50+
ALTER COLUMN planning_time_with_aqo SET STORAGE MAIN;
51+
ALTER TABLE aqo_query_stat
52+
ALTER COLUMN planning_time_without_aqo SET STORAGE MAIN;
53+
ALTER TABLE aqo_query_stat
54+
ALTER COLUMN cardinality_error_without_aqo SET STORAGE MAIN;
55+
ALTER TABLE aqo_query_stat
56+
ALTER COLUMN cardinality_error_with_aqo SET STORAGE MAIN;
5057

5158
INSERT INTO aqo_queries VALUES (0, false, false, 0, false);
5259
INSERT INTO aqo_query_texts VALUES (0, 'COMMON feature space (do not delete!)');

‎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.0'
3+
default_version = '1.1'
44
module_pathname = '$libdir/aqo'
55
relocatable = false

0 commit comments

Comments
 (0)