初回ベンチ（DB index などは ruby から引き継ぎ） 357969

Author: mickamy

.github/workflows/benchmark.yml

@@ -41,7 +41,7 @@ jobs:
           make pull || true
           make build
         timeout-minutes: 20
-      - run: make up bench-with-db-init WORKLOAD=4
+      - run: make up bench-with-db-init
         timeout-minutes: 10
       - name: Dump docker logs
         uses: jwalton/gh-docker-logs@v2

docker/app/go/Dockerfile

@@ -2,7 +2,7 @@ ARG BASE_IMAGE=ishocon2-app-base:latest
 FROM ${BASE_IMAGE}
 
 RUN sudo apt-get update && \
-    sudo apt-get install -y percona-toolkit && \
+    sudo apt-get install -y zip percona-toolkit && \
     sudo apt-get clean
 
 # Go のインストール
@@ -15,6 +15,13 @@ ENV GOROOT /usr/local/go
 ENV GOPATH /home/ishocon/.local/go
 ENV PATH $PATH:$GOROOT/bin
 
+# install alp
+RUN sudo curl -L -O https://github.com/tkuchiki/alp/releases/download/v1.0.21/alp_linux_${TARGETARCH}.zip && \
+    sudo unzip alp_linux_${TARGETARCH}.zip && \
+    sudo rm -rf unzip alp_linux_${TARGETARCH}.zip && \
+    sudo mv alp /usr/local/bin/ && \
+    alp --version
+
 # アプリケーション
 COPY --chown=ishocon:ishocon webapp/ /home/ishocon/webapp
 RUN cd ~/webapp/go && \

note.go.md

@@ -0,0 +1,15 @@
+初回ベンチ（DB index などは ruby から引き継ぎ） 357969
+
+```
+❯ make bench
+docker exec -i ishocon2-bench-1 sh -c "./benchmark --ip app:443 --workload 7"
+2024/01/09 09:42:23 Start GET /initialize
+2024/01/09 09:42:23 期日前投票を開始します
+2024/01/09 09:42:24 期日前投票が終了しました
+2024/01/09 09:42:24 投票を開始します  Workload: 7
+2024/01/09 09:43:09 投票が終了しました
+2024/01/09 09:43:09 投票者が結果を確認しています
+2024/01/09 09:43:24 投票者の感心がなくなりました
+2024/01/09 09:43:24 {"score": 357969, "success": 234209, "failure": 0}
+```
+

scripts/modify_db_schema.sql

@@ -2,7 +2,7 @@ ALTER TABLE users ADD INDEX (name, address, mynumber);
 ALTER TABLE candidates ADD INDEX (political_party);
 ALTER TABLE votes ADD COLUMN count int(4) NOT NULL;
 ALTER TABLE votes ADD INDEX (candidate_id, count);
-CREATE TABLE candidate_keywords
+CREATE TABLE IF NOT EXISTS candidate_keywords
 (
     id           int(11) NOT NULL AUTO_INCREMENT,
     candidate_id int(11) NOT NULL,

webapp/go/candidate.go

@@ -94,7 +94,7 @@ func getElectionResult() (result []CandidateElectionResult) {
 		SELECT c.id, c.name, c.political_party, c.sex, IFNULL(v.count, 0)
 		FROM candidates AS c
 		LEFT OUTER JOIN
-	  	(SELECT candidate_id, COUNT(*) AS count
+	  	(SELECT candidate_id, IFNULL(SUM(count), 0) AS count
 	  	FROM votes
 	  	GROUP BY candidate_id) AS v
 		ON c.id = v.candidate_id

webapp/go/main.go

@@ -168,9 +168,10 @@ func main() {
 		} else if c.PostForm("keyword") == "" {
 			message = "投票理由を記入してください"
 		} else {
-			for i := 1; i <= voteCount; i++ {
-				createVote(user.ID, candidate.ID, c.PostForm("keyword"))
-			}
+			//for i := 1; i <= voteCount; i++ {
+			//	createVote(user.ID, candidate.ID, c.PostForm("keyword"))
+			//}
+			createVote(user.ID, candidate.ID, c.PostForm("keyword"), voteCount)
 			message = "投票に成功しました"
 		}
 		c.HTML(http.StatusOK, "base", gin.H{

webapp/go/vote.go

@@ -11,20 +11,20 @@ type Vote struct {
 }
 
 func getVoteCountByCandidateID(candidateID int) (count int) {
-	row := db.QueryRow("SELECT COUNT(*) AS count FROM votes WHERE candidate_id = ?", candidateID)
+	row := db.QueryRow("SELECT IFNULL(SUM(count), 0) AS count FROM votes WHERE candidate_id = ?", candidateID)
 	row.Scan(&count)
 	return
 }
 
 func getUserVotedCount(userID int) (count int) {
-	row := db.QueryRow("SELECT COUNT(*) AS count FROM votes WHERE user_id = ?", userID)
+	row := db.QueryRow("SELECT count FROM votes WHERE user_id = ?", userID)
 	row.Scan(&count)
 	return
 }
 
-func createVote(userID int, candidateID int, keyword string) {
-	db.Exec("INSERT INTO votes (user_id, candidate_id, keyword) VALUES (?, ?, ?)",
-		userID, candidateID, keyword)
+func createVote(userID int, candidateID int, keyword string, count int) {
+	db.Exec("INSERT INTO votes (user_id, candidate_id, keyword, count) VALUES (?, ?, ?, ?)",
+		userID, candidateID, keyword, count)
 }
 
 func getVoiceOfSupporter(candidateIDs []int) (voices []string) {
@@ -37,7 +37,7 @@ func getVoiceOfSupporter(candidateIDs []int) (voices []string) {
     FROM votes
     WHERE candidate_id IN (`+strings.Join(strings.Split(strings.Repeat("?", len(candidateIDs)), ""), ",")+`)
     GROUP BY keyword
-    ORDER BY COUNT(*) DESC
+    ORDER BY IFNULL(SUM(count), 0) DESC
     LIMIT 10`, args...)
 	if err != nil {
 		return nil