Commit dfee1bb
rock: drop external tuple merger and tuple keydef installation
Crud requires a tuple merger to work, and it currently works with three
kinds of mergers: an embedded Tarantool one, an external one, and a crud
embedded one. The latter implementation is suboptimal but does not depend
on any additional symbols.
The external merger replicates Tarantool's embedded merger, and serves two
purposes:
1. Bring tuple merging to Tarantool 1.10 which does not have an embedded
merger.
2. Allows for versioning the merger module independently from Tarantool.
Because of potential symbol dependency conflicts, the external merger is
installed in a hacky way, which didn't actually work when crud is built as
part of another rockspec.
Since Tarantool 1.10 can work with the merger embedded to crud, there is no
need in pulling an external merger, so let's drop this dependency.
Instead, add a CI matrix case with external merger installation to test
against it.
All written above also applies to the tuple keydef module.
Needed for tarantool/tarantool#81471 parent 588c215 commit dfee1bb
File tree
3 files changed
+18
-15
lines changed- .github/workflows
3 files changed
+18
-15
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
| 24 | + | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | 28 | | |
28 | 29 | | |
29 | | - | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
41 | 44 | | |
42 | 45 | | |
43 | 46 | | |
| |||
102 | 105 | | |
103 | 106 | | |
104 | 107 | | |
105 | | - | |
106 | | - | |
107 | | - | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
108 | 115 | | |
109 | 116 | | |
110 | 117 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
8 | 14 | | |
9 | 15 | | |
10 | 16 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
98 | | - | |
99 | | - | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
0 commit comments