Merge remote-tracking branch 'origin/latest' into gh-1025-releases-lifetime-table

Author: art-dr

doc/reference/configuration/cfg_basic.rst

@@ -61,20 +61,29 @@
 .. confval:: listen
 
     Since version 1.6.4.
+
     The read/write data port number or :ref:`URI <index-uri>` (Universal
     Resource Identifier) string. Has no default value, so **must be specified**
-    if connections will occur from remote clients that do not use the
-    :ref:`“admin port” <admin-security>`. Connections made with
+    if connections occur from the remote clients that don't use the
+    :ref:`"admin port" <admin-security>`. Connections made with
     :samp:`listen = {URI}` are called "binary port" or "binary protocol"
     connections.
 
     A typical value is 3301.
 
-    .. NOTE::
+    ..  code-block:: lua
+
+        box.cfg { listen = 3301 }
+
+        box.cfg { listen = "127.0.0.1:3301" }
+
+    ..  NOTE::
 
         A replica also binds to this port, and accepts connections, but these
         connections can only serve reads until the replica becomes a master.
 
+    Starting from version 2.10.0, you can specify :ref:`several URIs <index-uri-several>`.
+
     | Type: integer or string
     | Default: null
     | Dynamic: yes

doc/reference/configuration/cfg_replication.rst

@@ -32,9 +32,13 @@
 
     :extsamp:`box.cfg{ replication = { {*{'uri1'}*}, {*{'uri2'}*} } }`
 
-    If one of the URIs is "self" -- that is, if one of the URIs is for the
-    instance where ``box.cfg{}`` is being executed on -- then it is ignored.
-    Thus it is possible to use the same ``replication`` specification on
+    ..  note::
+
+        Starting from version 2.10.0, there is a number of other ways for specifying several URIs. See :ref:`syntax examples <index-uri-several>`.
+
+    If one of the URIs is "self"---that is, if one of the URIs is for the
+    instance where ``box.cfg{}`` is being executed on---then it is ignored.
+    Thus, it is possible to use the same ``replication`` specification on
     multiple server instances, as shown in
     :ref:`these examples <replication-bootstrap>`.
 

doc/reference/configuration/cfg_storage.rst

@@ -42,7 +42,7 @@
 
     | Type: integer
     | Default: 1024 * 1024 = 1048576 bytes
-    | Dynamic: no
+    | Dynamic: **yes**
 
 .. _cfg_storage-memtx_min_tuple_size:
 

doc/reference/configuration/index.rst

@@ -69,18 +69,25 @@ Command options
 URI
 --------------------------------------------------------------------------------
 
-Some configuration parameters and some functions depend on a URI, or
-"Universal Resource Identifier". The URI string format is similar to the
+Some configuration parameters and some functions depend on a URI (Universal Resource Identifier).
+The URI string format is similar to the
 `generic syntax for a URI schema <https://en.wikipedia.org/wiki/List_of_URI_schemes>`_.
-So it may contain (in order) a user name
-for login, a password, a host name or host IP address, and a port number. Only
-the port number is always mandatory. The password is mandatory if the user
-name is specified, unless the user name is 'guest'. So, formally, the URI
+It may contain (in order):
+
+* user name for login
+* password
+* host name or host IP address
+* port number.
+
+Only a port number is always mandatory. A password is mandatory if a user
+name is specified, unless the user name is 'guest'.
+
+Formally, the URI
 syntax is ``[host:]port`` or ``[username:password@]host:port``.
-If host is omitted, then '0.0.0.0' or '[::]' is assumed,
-meaning respectively any IPv4 address or any IPv6 address,
+If host is omitted, then "0.0.0.0" or "[::]" is assumed
+meaning respectively any IPv4 address or any IPv6 address
 on the local machine.
-If username:password is omitted, then 'guest' is assumed. Some examples:
+If ``username:password`` is omitted, then the "guest" user is assumed. Some examples:
 
 ..  container:: table
 
@@ -97,12 +104,122 @@ If username:password is omitted, then 'guest' is assumed. Some examples:
     | username:password@host:port | notguest:[email protected]:3301 |
     +-----------------------------+------------------------------+
 
-In certain circumstances a Unix domain socket may be used
-where a URI is expected, for example "unix/:/tmp/unix_domain_socket.sock" or
+In code, the URI value can be passed as a number (if only a port is specified) or a string:
+
+..  code-block:: lua
+
+    box.cfg { listen = 3301 }
+
+    box.cfg { listen = "127.0.0.1:3301" }
+
+In certain circumstances, a Unix domain socket may be used
+where a URI is expected, for example, "unix/:/tmp/unix_domain_socket.sock" or
 simply "/tmp/unix_domain_socket.sock".
 
 A method for parsing URIs is illustrated in :ref:`Module uri <uri-parse>`.
 
+.. _index-uri-several:
+
+Specifying several URIs
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Starting from version 2.10.0, a user can open several listening iproto sockets on a Tarantool instance
+and, consequently, can specify several URIs in the configuration parameters
+such as :ref:`box.cfg.listen <cfg_basic-listen>` and :ref:`box.cfg.replication <cfg_replication-replication>`.
+
+URI values can be set in a number of ways:
+
+*   As a string with URI values separated by commas.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = "127.0.0.1:3301, /unix.sock, 3302" }
+
+*   As a table that contains URIs in the string format.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = {"127.0.0.1:3301", "/unix.sock", "3302"} }
+
+*   As an array of tables with the ``uri`` field.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = {
+                {uri = "127.0.0.1:3301"},
+                {uri = "/unix.sock"},
+                {uri = 3302}
+            }
+        }
+
+*   In a combined way---an array that contains URIs in both the string and the table formats.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = {
+                "127.0.0.1:3301",
+                { uri = "/unix.sock" },
+                { uri = 3302 }
+            }
+        }
+
+Also, starting from version 2.10.0, it is possible to specify additional parameters for URIs.
+You can do this in different ways:
+
+*   Using the ``?`` delimiter when URIs are specified in a string format.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = "127.0.0.1:3301?p1=value1&p2=value2, /unix.sock?p3=value3" }
+
+*   Using the ``params`` table: a URI is passed in a table with additional parameters in the "params" table.
+    Parameters in the "params" table overwrite the ones from a URI string ("value2" overwries "value1" for ``p1`` in the example below).
+
+    ..  code-block:: lua
+
+        box.cfg { listen = {
+                "127.0.0.1:3301?p1=value1",
+                params = {p1 = "value2", p2 = "value3"}
+            }
+        }
+
+*   Using the ``default_params`` table for specifying default parameter values.
+
+    In the example below, two URIs are passed in a table.
+    The default value for the ``p3`` parameter is defined in the ``default_params`` table
+    and used if this parameter is not specified in URIs.
+    Parameters in the ``default_params`` table are applicable to all the URIs passed in a table.
+
+    ..  code-block:: lua
+
+        box.cfg { listen = {
+                "127.0.0.1:3301?p1=value1",
+                { uri = "/unix.sock", params = { p2 = "value2" } },
+                default_params = { p3 = "value3" }
+            }
+        }
+
+The recommended way for specifying URI with additional parameters is the following:
+
+..  code-block:: lua
+
+    box.cfg { listen = {
+            {uri = "127.0.0.1:3301", params = {p1 = "value1"}},
+            {uri = "/unix.sock", params = {p2 = "value2"}},
+            {uri = 3302, params = {p3 = "value3"}}
+        }
+    }
+
+In case of a single URI, the following syntax also works:
+
+..  code-block:: lua
+
+    box.cfg { listen = {
+            uri = "127.0.0.1:3301",
+            params = { p1 = "value1", p2 = "value2" }
+        }
+    }
+
 ..  _index-init_label:
 
 --------------------------------------------------------------------------------

doc/reference/reference_lua/box_null.rst

@@ -9,7 +9,7 @@ For example: you can't correctly assess the length of a table that is not a sequ
 
 **Example:**
 
-.. code-block:: tarantoolsession
+..  code-block:: tarantoolsession
 
     tarantool> t = {0, nil, 1, 2, nil}
     ---
@@ -41,9 +41,9 @@ To avoid this problem, use Tarantool's ``box.NULL`` constant instead of **nil**.
 ``box.NULL`` is a placeholder for a **nil** value in tables to preserve a key
 without a value.
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Using box.NULL
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~
 
 ``box.NULL`` is a value of the cdata type representing a NULL pointer.
 It is similar to ``msgpack.NULL``, ``json.NULL`` and ``yaml.NULL``. So it is
@@ -99,9 +99,9 @@ Use ``box.NULL`` only with capitalized NULL (``box.null`` is incorrect).
     will always execute the function ``func()`` (because the condition ``box.NULL`` will
     always be neither **false** nor **nil**).
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Distinction of nil and `box.NULL`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Distinction of nil and box.NULL
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Use the expression ``if x == nil`` to check if the ``x`` is either a **nil**
 or a ``box.NULL``.

doc/release/1.10.7.rst

@@ -3,7 +3,7 @@ Tarantool 1.10.7
 
 Release: :tarantool-release:`1.10.7`
 
-Date: 2019-07-17 Tag: 1.10.7-1-gb93a33a
+Date: 2020-07-17 Tag: 1.10.7-1-gb93a33a
 
 Overview
 --------