From 2cdd4dc5fb1054a8e051c34d84c102ff9eae8c24 Mon Sep 17 00:00:00 2001 From: Kazuyuki SUZUKI Date: Sat, 3 Feb 2018 21:20:34 +0900 Subject: [PATCH] bench: Insert "SET NAMES utf8mb4" into initial dataset sql --- README.md | 2 +- bench/src/bench/dataset.go | 1 + provisioning/allinone/roles/mysql/tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a1dd2678..1a6049bb 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ mysql> GRANT ALL on *.* TO isucon@'localhost'; 初期データ投入 ```sh -zcat ~/isubata/bench/isucon7q-initial-dataset.sql.gz | sudo mysql --default-character-set=utf8 isubata +zcat ~/isubata/bench/isucon7q-initial-dataset.sql.gz | sudo mysql isubata ``` デフォルトだとTCPが127.0.0.1しかbindしてないので、複数台構成に対応するには diff --git a/bench/src/bench/dataset.go b/bench/src/bench/dataset.go index 4c463ac4..39b43b6b 100644 --- a/bench/src/bench/dataset.go +++ b/bench/src/bench/dataset.go @@ -247,6 +247,7 @@ func GenerateInitialDataSetSQL(outputPath string) { w := gzip.NewWriter(outFile) defer w.Close() + fbadf(w, "SET NAMES utf8mb4;") fbadf(w, "BEGIN;") rnd := rand.New(rand.NewSource(3656)) diff --git a/provisioning/allinone/roles/mysql/tasks/main.yml b/provisioning/allinone/roles/mysql/tasks/main.yml index 0c9c91bf..d64f1f99 100644 --- a/provisioning/allinone/roles/mysql/tasks/main.yml +++ b/provisioning/allinone/roles/mysql/tasks/main.yml @@ -76,7 +76,7 @@ #when: isubata_repository.changed - name: Import benchmark data - shell: zcat isucon7q-initial-dataset.sql.gz | mysql --default-character-set=utf8 isubata + shell: zcat isucon7q-initial-dataset.sql.gz | mysql isubata args: chdir: /home/isucon/isubata/bench/ become: yes