Skip to content

Commit dfee1bb

Browse files
CuriousGeorgiyDifferentialOrange
authored andcommitted
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#8147
1 parent 588c215 commit dfee1bb

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.github/workflows/test_on_push.yaml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
tarantool-version: ["1.10.6", "1.10", "2.2", "2.3", "2.4", "2.5", "2.6", "2.7", "2.8", "2.10", "2.11"]
2121
metrics-version: [""]
2222
cartridge-version: ["2.8.0"]
23-
remove-merger: [false]
23+
external-tuple-merger-version: [""]
24+
external-tuple-keydef-version: [""]
2425
include:
2526
- tarantool-version: "1.10"
2627
metrics-version: "1.0.0"
2728
cartridge-version: "2.8.0"
2829
- tarantool-version: "2.7"
29-
remove-merger: true
3030
cartridge-version: "2.8.0"
3131
- tarantool-version: "2.10"
3232
metrics-version: "0.10.0"
@@ -38,6 +38,9 @@ jobs:
3838
- tarantool-version: "2.11"
3939
metrics-version: "1.0.0"
4040
vshard-version: "0.1.24"
41+
- tarantool-version: "2.11"
42+
external-merger-version: "0.0.5"
43+
external-keydef-version: "0.0.4"
4144
- tarantool-version: "master"
4245
metrics-version: "1.0.0"
4346
vshard-version: "0.1.24"
@@ -102,9 +105,13 @@ jobs:
102105
if: matrix.metrics-version != ''
103106
run: tt rocks install metrics ${{ matrix.metrics-version }}
104107

105-
- name: Remove external merger if needed
106-
if: ${{ matrix.remove-merger }}
107-
run: rm .rocks/lib/tarantool/tuple/merger.so
108+
- name: Install external tuple-merger
109+
if: matrix.external-tuple-merger-version != ''
110+
run: tt rocks install tuple-merger ${{ matrix.external-tuple-merger-version }}
111+
112+
- name: Install external tuple-keydef
113+
if: matrix.external-tuple-keydef-version != ''
114+
run: tt rocks install tuple-keydef ${{ matrix.external-tuple-keydef-version }}
108115

109116
# This server starts and listen on 8084 port that is used for tests
110117
- name: Stop Mono server

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

8+
## Unreleased
9+
10+
### Changed
11+
* Dropped external tuple merger and tuple keydef modules installation from the
12+
package build (#390).
13+
814
## [1.4.0] - 16-10-23
915

1016
### Added

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,3 @@ install(
9595
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/cartridge
9696
DESTINATION ${TARANTOOL_INSTALL_LUADIR}
9797
)
98-
99-
# Don't include to rockspec as some Tarantool versions (e.g. 2.2 and 2.3)
100-
# don't have symbols required by "tuple-merger" and "tuple-keydef" modules.
101-
execute_process(
102-
COMMAND bash "-c" "tarantoolctl rocks install tuple-keydef 0.0.2"
103-
)
104-
105-
execute_process(
106-
COMMAND bash "-c" "tarantoolctl rocks install tuple-merger 0.0.2"
107-
)

0 commit comments

Comments
 (0)