Commit 544ef10
committed
mk-oracle: drop query variants for databases below 12.1.0.2
12.1.0.2 is the minimum supported release, so a query variant written for an
older database can never be selected. Every section now ships a single
variant. The one exception is jobs, which keeps its split into a CDB and a
non-CDB variant, because the two differ in their number of fields.
- Ten variants written for releases below 12.1.0.2 are gone. Two of them were
broken anyway. tablespaces.10020000.all.sql read cdb_data_files,
cdb_tablespaces and v$containers, none of which exist before 12.1, so it
raised ORA-00942 on exactly the databases it was written for.
asm_diskgroup.10020000.all.sql selected one field too many, so the check
matched its columns against the wrong layout.
- instance.0.all.sql and sessions.0.all.sql now hold what
instance.12010002.all.sql and sessions.12010000.all.sql held. Deleting the
below-floor variants freed those two file names.
- Every surviving query is tagged min_version 0. A gate at 12.1 can no longer
fail to match, so it carries no information.
- jobs becomes jobs.0.cdb.sql and jobs.0.nocdb.sql. Tenant::NoCdb is now the
only thing that selects the ten-field shape.
- The tests that asserted the version tiering are removed along with the
tiering itself. The tests on query content stay, and the sweep over all
sections still resolves every id for both tenants at 12.1.0.2, 19, 21
and 23.
TESTS: Manual and automated. Confirmed against a real Oracle database in
Docker (23.26), where the section output is unchanged. Unit and component
suites are green.
CMK-37731
Change-Id: I8248a170f247eb5e92fbcf8fc47cab8281d70fc31 parent 7834f14 commit 544ef10
26 files changed
Lines changed: 197 additions & 1246 deletions
File tree
- packages/mk-oracle
- sqls
- src/ora_sql
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
59 | | - | |
60 | | - | |
| 59 | + | |
61 | 60 | | |
62 | | - | |
| 61 | + | |
63 | 62 | | |
64 | | - | |
65 | 63 | | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
70 | 67 | | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
| 68 | + | |
| 69 | + | |
75 | 70 | | |
76 | 71 | | |
77 | | - | |
78 | | - | |
| 72 | + | |
79 | 73 | | |
80 | | - | |
81 | | - | |
| 74 | + | |
82 | 75 | | |
83 | | - | |
84 | 76 | | |
85 | | - | |
86 | | - | |
| 77 | + | |
87 | 78 | | |
88 | | - | |
89 | | - | |
| 79 | + | |
90 | 80 | | |
91 | 81 | | |
92 | 82 | | |
| |||
File renamed without changes.
This file was deleted.
File renamed without changes.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
16 | 71 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | | - | |
30 | | - | |
31 | | - | |
32 | | - | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
0 commit comments