Skip to content

Commit 6976fc9

Browse files
authored
Merge branch 'latest' into pgulutzan-gh-538
2 parents 4043b80 + 078d355 commit 6976fc9

File tree

296 files changed

+7207
-2840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+7207
-2840
lines changed

.github/ISSUE_TEMPLATE/document.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Write or update
33
about: Write or update a documentation page
4-
title: "[0pt] {feature_name}"
4+
title: "{feature_name}"
55
labels:
66
assignees:
77
---

.github/ISSUE_TEMPLATE/fix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Fix & proofread
33
about: Fix typos, proofread document
4-
title: "[0pt] Fix {document_title}"
4+
title: "Fix {document_title}"
55
labels: typo
66
assignees:
77
---

.github/ISSUE_TEMPLATE/tech.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: Technical/internal issue
33
about: Technical issue in the docs
4-
title: "[0pt] {do X}"
4+
title: "{do X}"
55
labels: internal
66
assignees:
77
---

.github/ISSUE_TEMPLATE/translate.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/versions.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/add-issues-to-project.yml

Lines changed: 0 additions & 18 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
- run: make build-modules
3333
- run: make json
3434
- run: make json-ru
35-
- run: make singlehtml
36-
- run: make singlehtml-ru
3735
- run: make pdf
3836
- run: make pdf-ru
3937
- uses: nelonoel/[email protected]

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ add_custom_target(update-pot
240240
COMMENT "Update translation sources"
241241
)
242242

243-
add_custom_target(update-po-no-force
243+
add_custom_target(update-po
244244
COMMAND "${SPHINX_INTL_EXECUTABLE}"
245245
update
246246
-p "${CMAKE_CURRENT_SOURCE_DIR}/locale/en/"
@@ -267,13 +267,6 @@ add_custom_target(cleanup-pot
267267
COMMENT "Cleanup and rearrange POT files"
268268
)
269269

270-
add_custom_target(update-po
271-
COMMAND make
272-
add-fake-msg
273-
update-po-no-force
274-
rm-fake-msg
275-
)
276-
277270
add_custom_target(linkcheck
278271
COMMAND "${SPHINX_EXECUTABLE}"
279272
-b linkcheck

build_submodules.sh

Lines changed: 72 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,73 +3,107 @@
33
set -xe
44

55
project_root=$(pwd)
6-
echo "${project_root}"
6+
7+
# Translations
78
po_dest="${project_root}/locale/ru/LC_MESSAGES"
9+
10+
11+
# Copy Building Tarantool Docs guide
12+
cp README.rst doc/contributing/docs/_includes/README.rst
13+
14+
15+
# Cartridge
816
cartridge_root="${project_root}/modules/cartridge"
9-
cartridge_rst_src="${project_root}/modules/cartridge/build.luarocks/build.rst"
17+
18+
# Build Cartridge to extract docs
19+
cd "${cartridge_root}" || exit
20+
CMAKE_DUMMY_WEBUI=true tarantoolctl rocks make
21+
22+
# Copy Cartridge docs, including diagrams and images
23+
cartridge_rst_src="${cartridge_root}/build.luarocks/build.rst"
1024
cartridge_rst_dest="${project_root}/doc/book/cartridge"
11-
cartridge_pot_src="${project_root}/modules/cartridge/build.luarocks/build.rst/locale"
25+
cd "${cartridge_rst_src}" || exit
26+
mkdir -p "${cartridge_rst_dest}"
27+
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_rst_dest}" \;
28+
29+
# Copy translation templates
30+
cartridge_pot_src="${cartridge_root}/build.luarocks/build.rst/locale"
1231
cartridge_pot_dest="${project_root}/locale/book/cartridge"
13-
cartridge_po_src="${project_root}/modules/cartridge/build.luarocks/build.rst/locale/ru/LC_MESSAGES"
32+
cd "${cartridge_pot_src}" || exit
33+
mkdir -p "${cartridge_pot_dest}"
34+
find . -name '*.pot' -exec cp -r --parents {} "${cartridge_pot_dest}" \;
35+
36+
# Copy translations
37+
cartridge_po_src="${cartridge_root}/build.luarocks/build.rst/locale/ru/LC_MESSAGES"
1438
cartridge_po_dest="${po_dest}/book/cartridge"
39+
cd "${cartridge_po_src}" || exit
40+
mkdir -p "${cartridge_po_dest}"
41+
find . -name '*.po' -exec cp -r --parents {} "${cartridge_po_dest}" \;
42+
43+
44+
# Cartridge CLI
1545
cartridge_cli_root="${project_root}/modules/cartridge-cli/doc"
1646
cartridge_cli_dest="${cartridge_rst_dest}/cartridge_cli"
1747
cartridge_cli_po_dest="${po_dest}/book/cartridge/cartridge_cli"
48+
49+
# Copy Cartridge CLI docs, including diagrams and images
50+
mkdir -p "${cartridge_cli_dest}"
51+
cd ${cartridge_cli_root} || exit
52+
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \;
53+
54+
# Copy translations
55+
mkdir -p "${cartridge_cli_po_dest}"
56+
cd "${cartridge_cli_root}/locale/ru/LC_MESSAGES/doc/" || exit
57+
find . -name '*.po' -exec cp -rv --parents {} "${cartridge_cli_po_dest}" \;
58+
59+
# Add Cartridge Kubernetes guide to the Cartridge toctree right after Cartridge CLI
60+
sed -i -e '/Cartridge CLI <cartridge_cli\/index>/a\' -e '\ \ \ Cartridge Kubernetes guide <cartridge_kubernetes_guide/index>' "${cartridge_rst_dest}/index.rst"
61+
62+
63+
# Monitoring
1864
monitoring_root="${project_root}/modules/metrics/doc/monitoring"
1965
monitoring_dest="${project_root}/doc/book"
2066
monitoring_grafana_root="${project_root}/modules/grafana-dashboard/doc/monitoring"
21-
luatest_root="${project_root}/modules/luatest"
22-
luatest_dest="${project_root}/doc/reference/reference_rock/luatest"
2367

24-
cartridge_kubernetes_root="${project_root}/modules/tarantool-operator/doc/cartridge_kubernetes_guide"
25-
cartridge_kubernetes_dest="${cartridge_rst_dest}/"
68+
# Copy monitoring docs to the right destination
69+
mkdir -p "${monitoring_dest}"
70+
yes | cp -rf "${monitoring_root}" "${monitoring_dest}/"
71+
yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/"
2672

27-
tntcxx_root="${project_root}/modules/tntcxx"
28-
tntcxx_gs_dest="${project_root}/doc/getting_started"
29-
tntcxx_api_dest="${project_root}/doc/book/connectors"
3073

31-
cp README.rst doc/contributing/docs/_includes/README.rst
74+
# Luatest
75+
luatest_root="${project_root}/modules/luatest"
76+
luatest_dest="${project_root}/doc/reference/reference_rock/luatest"
3277

33-
mkdir -p "${luatest_dest}/_includes/"
78+
# Generate Luatest docs
3479
cd "${luatest_root}"
3580
ldoc --ext=rst --dir=rst --toctree="API" .
81+
82+
# Copy Luatest docs to the right place
3683
cd "${luatest_dest}"
3784
yes | cp -fa "${luatest_root}/rst/." "${luatest_dest}"
3885
yes | cp "${luatest_root}/README.rst" "${luatest_dest}"
86+
mkdir -p "${luatest_dest}/_includes/"
3987
yes | mv -f "${luatest_dest}/index.rst" "${luatest_dest}/_includes/"
4088

41-
mkdir -p "${monitoring_dest}"
42-
yes | cp -rf "${monitoring_root}" "${monitoring_dest}/"
43-
yes | cp -rf "${monitoring_grafana_root}" "${monitoring_dest}/"
4489

45-
mkdir -p "${cartridge_cli_dest}" "${cartridge_cli_po_dest}"
46-
cd ${cartridge_cli_root} || exit
47-
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \;
48-
cd "${cartridge_cli_root}/locale/ru/LC_MESSAGES/doc/" || exit
49-
find . -name '*.po' -exec cp -rv --parents {} "${cartridge_cli_po_dest}" \;
90+
# Kubernetes operator
91+
cartridge_kubernetes_root="${project_root}/modules/tarantool-operator/doc/cartridge_kubernetes_guide"
92+
cartridge_kubernetes_dest="${cartridge_rst_dest}/"
5093

94+
# Copy Kubernetes operator docs to the right place
5195
mkdir -p "${cartridge_kubernetes_dest}"
5296
yes | cp -rf "${cartridge_kubernetes_root}" "${cartridge_kubernetes_dest}"
5397

98+
99+
# Tarantool C++ connector
100+
tntcxx_root="${project_root}/modules/tntcxx"
101+
tntcxx_gs_dest="${project_root}/doc/getting_started"
102+
tntcxx_api_dest="${project_root}/doc/book/connectors"
103+
104+
# Copy Tarantool C++ connector docs to the right places
54105
mkdir -p "${tntcxx_api_dest}/cxx/"
55106
mkdir -p "${tntcxx_gs_dest}/_includes"
56107
yes | cp -rf "${tntcxx_root}/doc/tntcxx_getting_started.rst" "${tntcxx_gs_dest}/getting_started_cxx.rst"
57108
yes | cp -rf "${tntcxx_root}/examples/" "${tntcxx_gs_dest}/_includes/examples/"
58109
yes | cp -rf "${tntcxx_root}/doc/tntcxx_api.rst" "${tntcxx_api_dest}/cxx/"
59-
60-
cd "${cartridge_root}" || exit
61-
CMAKE_DUMMY_WEBUI=true tarantoolctl rocks make
62-
63-
cd "${cartridge_rst_src}" || exit
64-
mkdir -p "${cartridge_rst_dest}"
65-
find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_rst_dest}" \;
66-
67-
cd "${cartridge_pot_src}" || exit
68-
mkdir -p "${cartridge_pot_dest}"
69-
find . -name '*.pot' -exec cp -r --parents {} "${cartridge_pot_dest}" \;
70-
71-
cd "${cartridge_po_src}" || exit
72-
mkdir -p "${cartridge_po_dest}"
73-
find . -name '*.po' -exec cp -r --parents {} "${cartridge_po_dest}" \;
74-
75-
sed -i -e '/Cartridge CLI<cartridge_cli\/index>/a\' -e '\ \ \ Cartridge Kubernetes guide<cartridge_kubernetes_guide/index>' "${cartridge_rst_dest}/index.rst"

doc/archive/shard.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
.. _shard-module:
44

55
-------------------------------------------------------------------------------
6-
Module `shard`
6+
Module shard
77
-------------------------------------------------------------------------------
88

99
.. module:: shard

doc/archive/tdb.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.. previous location: doc/reference/reference_rock/tdb.rst
22
33
-------------------------------------------------------------------------------
4-
Module `tdb`
4+
Module tdb
55
-------------------------------------------------------------------------------
66

77
The Tarantool Debugger (abbreviation = ``tdb``) can be used with any Lua program.

doc/book/admin/index.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
:noindex:
2+
:fullwidth:
3+
14
.. _admin:
25

36
********************************************************************************

doc/book/admin/server_introspection.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ does 500,000 inserts and deletes in a Tarantool space.
650650
Start the profiler, execute the function, stop the
651651
profiler, and show what the profiler sampled.
652652

653-
.. code-block:: none
653+
.. code-block:: lua
654654
655655
box.space.t:drop()
656656
box.schema.space.create('t')

doc/book/admin/upgrades.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
Upgrades
55
================================================================================
66

7+
For information about backwards compatibility,
8+
see the :ref:`compatibility guarantees <compatibility_guarantees>` description.
9+
710
.. _admin-upgrades_db:
811

912
--------------------------------------------------------------------------------

doc/book/box/engines/index.rst

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
:fullwidth:
2+
13
.. _engines-chapter:
24

35
Storage engines
@@ -9,53 +11,11 @@ retrieve :term:`tuple <tuple>` values. Tarantool offers a choice of two storage
911
* :doc:`memtx <memtx>` is the in-memory storage engine used by default.
1012
* :doc:`vinyl <vinyl>` is the on-disk storage engine.
1113

12-
Below you can find comparing of the two engines in brief.
13-
All the details on how each engine works you can find in the dedicated
14-
sections:
14+
All the details on the engines you can find in the dedicated sections:
1515

1616
.. toctree::
1717
:maxdepth: 1
1818

1919
memtx
2020
vinyl
21-
22-
.. _vinyl_diff:
23-
24-
Difference between memtx and vinyl storage engines
25-
--------------------------------------------------
26-
27-
The primary difference between memtx and vinyl is that memtx is an in-memory
28-
engine while vinyl is an on-disk engine. An in-memory storage engine is
29-
generally faster (each query is usually run under 1 ms), and the memtx engine
30-
is justifiably the default for Tarantool. But on-disk engine such as vinyl is
31-
preferable when the database is larger than the available memory, and adding more
32-
memory is not a realistic option.
33-
34-
.. container:: table
35-
36-
.. rst-class:: left-align-column-1
37-
.. rst-class:: left-align-column-2
38-
39-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
40-
| Option | memtx | vinyl |
41-
+=============================================+======================================================+======================================================+
42-
| Supported index type | TREE, HASH, :ref:`RTREE <box_index-rtree>` or BITSET | TREE |
43-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
44-
| Temporary spaces | Supported | Not supported |
45-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
46-
| :ref:`random() <box_index-random>` function | Supported | Not supported |
47-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
48-
| :ref:`alter() <box_index-alter>` function | Supported | Supported starting from the 1.10.2 release |
49-
| | | (the primary index cannot be modified) |
50-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
51-
| :ref:`len() <box_space-len>` function | Returns the number of tuples in the space | Returns the maximum approximate number of tuples in |
52-
| | | the space |
53-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
54-
| :ref:`count() <box_index-count>` function | Takes a constant amount of time | Takes a variable amount of time depending on a state |
55-
| | | of a DB |
56-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
57-
| :ref:`delete() <box_space-delete>` function | Returns the deleted tuple, if any | Always returns nil |
58-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
59-
| yield | Does not yield on the select requests unless the | Yields on the select requests or on its equivalents: |
60-
| | transaction is committed to WAL | get() or pairs() |
61-
+---------------------------------------------+------------------------------------------------------+------------------------------------------------------+
21+
memtx_vinyl_diff

0 commit comments

Comments
 (0)