diff --git a/cfg/tarantool_box_cfg.h b/cfg/tarantool_box_cfg.h index 2c883bbdca2e158df55844ea6026cb1fa055c2a9..2e720df3886fcb3ff1ff8511b2504592cc156754 100644 --- a/cfg/tarantool_box_cfg.h +++ b/cfg/tarantool_box_cfg.h @@ -13,30 +13,6 @@ * Autogenerated file, do not edit it! */ -typedef struct tarantool_cfg_space_index_key_field { - unsigned char __confetti_flags; - - int32_t fieldno; - char* type; -} tarantool_cfg_space_index_key_field; - -typedef struct tarantool_cfg_space_index { - unsigned char __confetti_flags; - - char* type; - confetti_bool_t unique; - tarantool_cfg_space_index_key_field** key_field; -} tarantool_cfg_space_index; - -typedef struct tarantool_cfg_space { - unsigned char __confetti_flags; - - confetti_bool_t enabled; - int32_t cardinality; - int32_t estimated_rows; - tarantool_cfg_space_index** index; -} tarantool_cfg_space; - typedef struct tarantool_cfg { unsigned char __confetti_flags; @@ -126,12 +102,6 @@ typedef struct tarantool_cfg { /* Write no more rows in WAL */ int32_t rows_per_wal; - /* - * OBSOLETE - * Starting from 1.4.5, this variable has no effect. - */ - int32_t wal_writer_inbox_size; - /* * Defines fiber/data synchronization fsync(2) policy: * "none": does not write to WAL @@ -181,21 +151,6 @@ typedef struct tarantool_cfg { */ char* custom_proc_title; - /* Memcached protocol support is enabled if memcached_port is set */ - int32_t memcached_port; - - /* space used for memcached emulation */ - int32_t memcached_space; - - /* Memcached expiration is on if memcached_expire is set. */ - confetti_bool_t memcached_expire; - - /* maximum rows to consider per expire loop iteration */ - int32_t memcached_expire_per_loop; - - /* tarantool will try to iterate over all rows within this time */ - double memcached_expire_full_sweep; - /* * Replication mode (if enabled, the server, once * bound to the primary port, will connect to @@ -204,7 +159,13 @@ typedef struct tarantool_cfg { * only accepts reads. */ char* replication_source; - tarantool_cfg_space** space; + + /* + * 1.6 (default) or 1.5 (old) replication mode + * If 1.5 mode is enabled, the replica will successfully + * connect to 1.5 master + */ + char* replication_protocol; } tarantool_cfg; #ifndef CNF_FLAG_STRUCT_NEW