Skip to content
This repository has been archived by the owner on Jun 24, 2021. It is now read-only.

Commit

Permalink
conf, roles: add the config of auto-random, expression and new-collat…
Browse files Browse the repository at this point in the history
…ion (#1217)

Co-authored-by: liubo <[email protected]>
  • Loading branch information
wjhuang2016 and liubo0127 authored Mar 23, 2020
1 parent d9bccb1 commit af9db07
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
10 changes: 10 additions & 0 deletions conf/tidb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ global:
# the data type of its primary key column is an integer, the primary key cannot be dropped.
# alter-primary-key: false

# Whether new collations are enabled, as indicated by its name, this configuration entry take effect ONLY when a TiDB cluster bootstraps for the first time.
new_collations_enabled_on_first_bootstrap: false

log:
# Log level: debug, info, warn, error, fatal.
# level: "info"
Expand Down Expand Up @@ -173,3 +176,10 @@ pessimistic_txn:

# max retry count for a statement in a pessimistic transaction.
# max-retry-count: 256

experimental:
# enable column attribute `auto_random` to be defined on the primary key column.
allow-auto-random: false

# enable creating expression index.
allow-expression-index: false
5 changes: 5 additions & 0 deletions roles/tidb/templates/tidb.toml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@
{% for item, value in tidb_conf.pessimistic_txn | dictsort -%}
{{ item }} = {{ value | to_json }}
{% endfor %}

[experimental]
{% for item, value in tidb_conf.experimental | dictsort -%}
{{ item }} = {{ value | to_json }}
{% endfor %}
10 changes: 10 additions & 0 deletions roles/tidb/vars/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ global:
# the data type of its primary key column is an integer, the primary key cannot be dropped.
alter-primary-key: false

# Whether new collations are enabled, as indicated by its name, this configuration entry take effect ONLY when a TiDB cluster bootstraps for the first time.
new_collations_enabled_on_first_bootstrap: false

log:
# Log level: debug, info, warn, error, fatal.
level: "info"
Expand Down Expand Up @@ -187,3 +190,10 @@ pessimistic_txn:

# max retry count for a statement in a pessimistic transaction.
max-retry-count: 256

experimental:
# enable column attribute `auto_random` to be defined on the primary key column.
allow-auto-random: false

# enable creating expression index.
allow-expression-index: false

0 comments on commit af9db07

Please sign in to comment.