[Groonga-commit] groonga/wikipedia-search at 629560b [master] Update benchmark script for PGroonga, pg_trgm and textsearch against English Wikipedia

アーカイブの一覧に戻る

Kouhei Sutou null+****@clear*****
Sat Nov 5 00:12:44 JST 2016


Kouhei Sutou	2016-11-05 00:12:44 +0900 (Sat, 05 Nov 2016)

  New Revision: 629560be24bc4848603446e0f430c1898dfdbae7
  https://github.com/groonga/wikipedia-search/commit/629560be24bc4848603446e0f430c1898dfdbae7

  Message:
    Update benchmark script for PGroonga, pg_trgm and textsearch against English Wikipedia

  Added files:
    benchmark/centos7/en-postgresql.sh
  Removed files:
    benchmark/centos6/pgroonga-and-textsearch.sh
  Modified files:
    benchmark/centos6/pgroonga.sh
    benchmark/centos7/ja-mysql.sh
    benchmark/centos7/ja-postgresql.sh
  Renamed files:
    benchmark/en-search-words.list
      (from benchmark/search-words-en.list)
    benchmark/ja-search-words.list
      (from benchmark/search-words.list)

  Deleted: benchmark/centos6/pgroonga-and-textsearch.sh (+0 -216) 100755
===================================================================
--- benchmark/centos6/pgroonga-and-textsearch.sh    2016-11-04 23:23:17 +0900 (8af97b9)
+++ /dev/null
@@ -1,216 +0,0 @@
-#!/bin/bash
-
-set -u
-
-LANG=C
-
-n_load_tries=1
-n_search_tries=5
-
-script_dir=$(cd "$(dirname $0)"; pwd)
-base_dir="${script_dir}/../.."
-config_dir="${base_dir}/config/sql"
-data_dir="${base_dir}/data/sql"
-benchmark_dir="${base_dir}/benchmark"
-
-pgroonga_db="benchmark_pgroonga"
-textsearch_db="benchmark_textsearch"
-
-run()
-{
-  "$@"
-  if test $? -ne 0; then
-    echo "Failed $@"
-    exit 1
-  fi
-}
-
-show_environment()
-{
-  echo "CPU:"
-  cat /proc/cpuinfo
-
-  echo "Memory:"
-  free
-}
-
-ensure_data()
-{
-  if [ -f "${data_dir}/en-all-pages.sql" ]; then
-    return
-  fi
-
-  run sudo -H yum install -y epel-release
-  run sudo -H yum install -y wget pxz
-  run mkdir -p "${data_dir}"
-  cd "${data_dir}"
-  run wget --no-verbose http://packages.groonga.org/tmp/en-all-pages.sql.xz
-  run pxz --keep --decompress en-all-pages.sql.xz
-  cd -
-}
-
-setup_postgresql_repository()
-{
-  os_version=$(run rpm -qf --queryformat="%{VERSION}" /etc/redhat-release)
-  os_arch=$(run rpm -qf --queryformat="%{ARCH}" /etc/redhat-release)
-  run sudo rpm -Uvh \
-      http://yum.postgresql.org/9.5/redhat/rhel-${os_version}-${os_arch}/pgdg-centos95-9.5-2.noarch.rpm
-}
-
-setup_groonga_repository()
-{
-  run sudo rpm -ivh \
-      http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
-}
-
-install_pgroonga()
-{
-  run sudo yum makecache
-  run sudo yum install -y postgresql95-pgroonga
-}
-
-install_textsearch()
-{
-  :
-}
-
-setup_postgresql()
-{
-  run sudo -H /sbin/service postgresql-9.5 initdb
-  run sudo -H /sbin/chkconfig postgresql-9.5 on
-  run sudo -H /sbin/service postgresql-9.5 start
-}
-
-setup_benchmark_db()
-{
-  run sudo -u postgres -H psql \
-      --command "DROP DATABASE IF EXISTS ${pgroonga_db}"
-  run sudo -u postgres -H psql \
-      --command "CREATE DATABASE ${pgroonga_db}"
-  run sudo -u postgres -H psql -d ${pgroonga_db} \
-      --command "CREATE EXTENSION pgroonga"
-
-  run sudo -u postgres -H psql \
-      --command "DROP DATABASE IF EXISTS ${textsearch_db}"
-  run sudo -u postgres -H psql \
-      --command "CREATE DATABASE ${textsearch_db}"
-}
-
-database_oid()
-{
-  sudo -u postgres -H psql \
-       --command "SELECT datid FROM pg_stat_database WHERE datname = '$1'" | \
-    head -3 | \
-    tail -1 | \
-    sed -e 's/ *//g'
-}
-
-load_data()
-{
-  echo "PGroonga: data: load:"
-  run sudo -u postgres -H psql -d ${pgroonga_db} < \
-      "${config_dir}/schema.postgresql.sql"
-  time run sudo -u postgres -H psql -d ${pgroonga_db} < \
-       "${data_dir}/en-all-pages.sql" > /dev/null
-  echo "PGroonga: data: load: size:"
-  run sudo -u postgres -H \
-      sh -c "du -hsc /var/lib/pgsql/9.5/data/base/$(database_oid ${pgroonga_db})/*"
-
-  echo "textsearch: data: load:"
-  run sudo -u postgres -H psql -d ${textsearch_db} < \
-      "${config_dir}/schema.postgresql.sql"
-  time run sudo -u postgres -H psql -d ${textsearch_db} < \
-       "${data_dir}/en-all-pages.sql" > /dev/null
-  echo "pg_biggm: data: load: size:"
-  run sudo -u postgres -H \
-      sh -c "du -hsc /var/lib/pgsql/9.5/data/base/$(database_oid ${textsearch_db})/*"
-}
-
-benchmark_create_index_pgroonga()
-{
-  run sudo -H /sbin/service postgresql-9.5 restart
-
-  for i in $(seq ${n_load_tries}); do
-    echo "PGroonga: create index: ${i}:"
-    run sudo -u postgres -H psql -d ${pgroonga_db} \
-        --command "DROP INDEX IF EXISTS wikipedia_index_pgroonga"
-    time run sudo -u postgres -H psql -d ${pgroonga_db} < \
-         "${config_dir}/indexes.pgroonga.sql"
-    if [ ${i} -eq 1 ]; then
-      echo "PGroonga: create index: size:"
-      run sudo -u postgres -H \
-          sh -c "du -hsc /var/lib/pgsql/9.5/data/base/$(database_oid ${pgroonga_db})/pgrn*"
-    fi
-  done
-}
-
-benchmark_create_index_textsearch()
-{
-  run sudo -H /sbin/service postgresql-9.5 restart
-
-  for i in $(seq ${n_load_tries}); do
-    echo "textsearch: create index: ${i}:"
-    run sudo -u postgres -H psql -d ${textsearch_db} \
-        --command "DROP INDEX IF EXISTS wikipedia_index_textsearch"
-    time run sudo -u postgres -H psql -d ${textsearch_db} < \
-         "${config_dir}/indexes.textsearch.sql"
-    if [ ${i} -eq 1 ]; then
-      echo "textsearch: create index: size:"
-      textsearch_data_path=$(sudo -u postgres -H psql -d ${textsearch_db} \
-                               --command "SELECT pg_relation_filepath(oid) FROM pg_class WHERE relname = 'wikipedia_index_textsearch'" | \
-                             head -3 | \
-                             tail -1 | \
-                             sed -e 's/ *//g')
-      run sudo -u postgres -H \
-          sh -c "du -hsc /var/lib/pgsql/9.5/data/${textsearch_data_path}*"
-    fi
-  done
-}
-
-benchmark_search_pgroonga()
-{
-  work_mem_size='10MB'
-  work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words-en.list" | while read search_word; do
-    for i in $(seq ${n_search_tries}); do
-      where="text @@ '${search_word}'"
-      echo "PGroonga: search: work_mem(${work_mem_size}): ${where}: ${i}:"
-      time run sudo -u postgres -H psql -d ${pgroonga_db} \
-           --command "${work_mem} SELECT COUNT(*) FROM wikipedia WHERE ${where}"
-    done
-  done
-}
-
-benchmark_search_textsearch()
-{
-  work_mem_size='10MB'
-  work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words-en.list" | while read search_word; do
-    for i in $(seq ${n_search_tries}); do
-      where="to_tsvector('english', text) @@ to_tsquery('${search_word}')"
-      where=$(echo $where | sed -e "s/ OR / | /g")
-      echo "textsearch: search: work_mem(${work_mem_size}): ${where}: ${i}:"
-      time run sudo -u postgres -H psql -d ${textsearch_db} \
-           --command "${work_mem} SELECT COUNT(*) FROM wikipedia WHERE ${where}"
-    done
-  done
-}
-
-show_environment
-
-ensure_data
-
-setup_postgresql_repository
-setup_groonga_repository
-install_pgroonga
-install_textsearch
-
-setup_postgresql
-setup_benchmark_db
-load_data
-
-benchmark_create_index_pgroonga
-benchmark_create_index_textsearch
-
-benchmark_search_pgroonga
-benchmark_search_textsearch

  Modified: benchmark/centos6/pgroonga.sh (+5 -5)
===================================================================
--- benchmark/centos6/pgroonga.sh    2016-11-04 23:23:17 +0900 (0f95a68)
+++ benchmark/centos6/pgroonga.sh    2016-11-05 00:12:44 +0900 (086c7a8)
@@ -178,7 +178,7 @@ benchmark_create_index_pg_bigm()
 
 benchmark_search_pgroonga()
 {
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text @@ '${search_word}'"
       echo "PGroonga: search: ${where}: ${i}:"
@@ -192,7 +192,7 @@ benchmark_search_pgroonga_large_work_mem()
 {
   work_mem_size='10MB'
   work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text @@ '${search_word}'"
       echo "PGroonga: search: large work_mem(${work_mem_size}): ${where}: ${i}:"
@@ -205,7 +205,7 @@ benchmark_search_pgroonga_large_work_mem()
 benchmark_search_pgroonga_force_index_scan()
 {
   force_index_scan="SET enable_seqscan = off; SET enable_bitmapscan = off;"
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text @@ '${search_word}'"
       echo "PGroonga: search: force index scan: ${where}: ${i}:"
@@ -217,7 +217,7 @@ benchmark_search_pgroonga_force_index_scan()
 
 benchmark_search_pg_bigm()
 {
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text LIKE '%${search_word}%'"
       where=$(echo $where | sed -e "s/ OR /%' OR text LIKE '%/g")
@@ -232,7 +232,7 @@ benchmark_search_pg_bigm_large_work_mem()
 {
   work_mem_size='10MB'
   work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text LIKE '%${search_word}%'"
       where=$(echo $where | sed -e "s/ OR /%' OR text LIKE '%/g")

  Added: benchmark/centos7/en-postgresql.sh (+321 -0) 100755
===================================================================
--- /dev/null
+++ benchmark/centos7/en-postgresql.sh    2016-11-05 00:12:44 +0900 (66f2718)
@@ -0,0 +1,321 @@
+#!/bin/bash
+
+set -u
+
+LANG=C
+
+n_load_tries=1
+n_create_index_tries=1
+n_search_tries=5
+
+pg_version=9.6
+pg_version_short=96
+
+script_dir=$(cd "$(dirname $0)"; pwd)
+base_dir="${script_dir}/../.."
+config_dir="${base_dir}/config/sql"
+data_dir="${base_dir}/data/sql"
+benchmark_dir="${base_dir}/benchmark"
+
+pgroonga_db="benchmark_pgroonga"
+pg_trgm_db="benchmark_pg_trgm"
+textsearch_db="benchmark_textsearch"
+
+run()
+{
+  "$@"
+  if test $? -ne 0; then
+    echo "Failed $@"
+    exit 1
+  fi
+}
+
+show_environment()
+{
+  echo "CPU:"
+  cat /proc/cpuinfo
+
+  echo "Memory:"
+  free
+}
+
+ensure_data()
+{
+  if [ -f "${data_dir}/en-all-pages.sql" ]; then
+    return
+  fi
+
+  run sudo -H yum install -y epel-release
+  run sudo -H yum install -y wget pxz
+  run mkdir -p "${data_dir}"
+  cd "${data_dir}"
+  run wget --no-verbose http://packages.groonga.org/tmp/en-all-pages.csv.xz
+  run pxz --keep --decompress en-all-pages.csv.xz
+  cd -
+}
+
+setup_postgresql_repository()
+{
+  os_version=$(run rpm -qf --queryformat="%{VERSION}" /etc/redhat-release)
+  os_arch=$(run rpm -qf --queryformat="%{ARCH}" /etc/redhat-release)
+  run sudo rpm -Uvh \
+      https://download.postgresql.org/pub/repos/yum/${pg_version}/redhat/rhel-7-x86_64/pgdg-centos${pg_version_short}-${pg_version}-3.noarch.rpm
+}
+
+setup_groonga_repository()
+{
+  run sudo rpm -Uvh \
+      http://packages.groonga.org/centos/groonga-release-1.1.0-1.noarch.rpm
+}
+
+install_pgroonga()
+{
+  run sudo yum install -y postgresql${pg_version_short}-pgroonga
+}
+
+install_pg_trgm()
+{
+  run sudo yum install -y postgresql${pg_version_short}-contrib
+}
+
+install_textsearch()
+{
+  :
+}
+
+setup_postgresql()
+{
+  run sudo -H \
+      env PGSETUP_INITDB_OPTIONS="--locale=C --encoding=UTF-8" \
+      /usr/pgsql-${pg_version}/bin/postgresql${pg_version_short}-setup initdb
+  run sudo -H systemctl enable postgresql-${pg_version}
+  run sudo -H systemctl start postgresql-${pg_version}
+}
+
+setup_benchmark_db_pgroonga()
+{
+  run sudo -u postgres -H psql \
+      --command "DROP DATABASE IF EXISTS ${pgroonga_db}"
+  run sudo -u postgres -H psql \
+      --command "CREATE DATABASE ${pgroonga_db}"
+  run sudo -u postgres -H psql -d ${pgroonga_db} \
+      --command "CREATE EXTENSION pgroonga"
+}
+
+setup_benchmark_db_pg_trgm()
+{
+  run sudo -u postgres -H psql \
+      --command "DROP DATABASE IF EXISTS ${pg_trgm_db}"
+  run sudo -u postgres -H psql \
+      --command "CREATE DATABASE ${pg_trgm_db}"
+  run sudo -u postgres -H psql -d ${pg_trgm_db} \
+      --command "CREATE EXTENSION pg_trgm"
+}
+
+setup_benchmark_db_textsearch()
+{
+  run sudo -u postgres -H psql \
+      --command "DROP DATABASE IF EXISTS ${textsearch_db}"
+  run sudo -u postgres -H psql \
+      --command "CREATE DATABASE ${textsearch_db}"
+}
+
+setup_benchmark_db()
+{
+  setup_benchmark_db_pgroonga
+  setup_benchmark_db_pg_trgm
+  setup_benchmark_db_textsearch
+}
+
+database_oid()
+{
+  sudo -u postgres -H psql \
+       --command "SELECT datid FROM pg_stat_database WHERE datname = '$1'" | \
+    head -3 | \
+    tail -1 | \
+    sed -e 's/ *//g'
+}
+
+load_data_pgroonga()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "PGroonga: data: load:"
+  run sudo -u postgres -H psql -d ${pgroonga_db} < \
+      "${config_dir}/schema.postgresql.sql"
+  time run sudo -u postgres -H psql -d ${pgroonga_db} \
+       --command "COPY wikipedia FROM '${data_dir}/en-all-pages.csv' WITH CSV ENCODING 'utf8'"
+
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "PGroonga: data: load: size:"
+  run sudo -u postgres -H \
+      sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${pgroonga_db})/*"
+}
+
+load_data_pg_trgm()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "pg_trgm: data: load:"
+  run sudo -u postgres -H psql -d ${pg_trgm_db} < \
+      "${config_dir}/schema.postgresql.sql"
+  time run sudo -u postgres -H psql -d ${pg_trgm_db} \
+       --command "COPY wikipedia FROM '${data_dir}/en-all-pages.csv' WITH CSV ENCODING 'utf8'"
+
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "pg_trgm: data: load: size:"
+  run sudo -u postgres -H \
+      sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${pg_trgm_db})/*"
+}
+
+load_data_textsearch()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "textsearch: data: load:"
+  run sudo -u postgres -H psql -d ${textsearch_db} < \
+      "${config_dir}/schema.postgresql.sql"
+  time run sudo -u postgres -H psql -d ${textsearch_db} \
+       --command "COPY wikipedia FROM '${data_dir}/en-all-pages.csv' WITH CSV ENCODING 'utf8'"
+
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  echo "textsearch: data: load: size:"
+  run sudo -u postgres -H \
+      sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${textsearch_db})/*"
+}
+
+load_data()
+{
+  load_data_pgroonga
+  load_data_pg_trgm
+  load_data_textsearch
+}
+
+benchmark_create_index_pgroonga()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  for i in $(seq ${n_load_tries}); do
+    echo "PGroonga: create index: ${i}:"
+    run sudo -u postgres -H psql -d ${pgroonga_db} \
+        --command "DROP INDEX IF EXISTS wikipedia_index_pgroonga"
+    time run sudo -u postgres -H psql -d ${pgroonga_db} < \
+         "${config_dir}/indexes.pgroonga.sql"
+    if [ ${i} -eq 1 ]; then
+      run sudo -H systemctl restart postgresql-${pg_version}
+      echo "PGroonga: create index: size:"
+      run sudo -u postgres -H \
+          sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${pgroonga_db})/pgrn*"
+    fi
+  done
+}
+
+benchmark_create_index_pg_trgm()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  for i in $(seq ${n_load_tries}); do
+    echo "pg_trgm: create index: ${i}:"
+    run sudo -u postgres -H psql -d ${pg_trgm_db} \
+        --command "DROP INDEX IF EXISTS wikipedia_index_pg_trgm"
+    time run sudo -u postgres -H psql -d ${pg_trgm_db} < \
+         "${config_dir}/indexes.pg_trgm.sql"
+    if [ ${i} -eq 1 ]; then
+      run sudo -H systemctl restart postgresql-${pg_version}
+      echo "pg_trgm: create index: size:"
+      run sudo -u postgres -H \
+          sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${pg_trgm_db})/pgrn*"
+    fi
+  done
+}
+
+benchmark_create_index_textsearch()
+{
+  run sudo -H systemctl restart postgresql-${pg_version}
+
+  for i in $(seq ${n_load_tries}); do
+    echo "textsearch: create index: ${i}:"
+    run sudo -u postgres -H psql -d ${textsearch_db} \
+        --command "DROP INDEX IF EXISTS wikipedia_index_textsearch"
+    time run sudo -u postgres -H psql -d ${textsearch_db} < \
+         "${config_dir}/indexes.textsearch.sql"
+    if [ ${i} -eq 1 ]; then
+      run sudo -H systemctl restart postgresql-${pg_version}
+      echo "textsearch: create index: size:"
+      run sudo -u postgres -H \
+          sh -c "du -hsc /var/lib/pgsql/${pg_version}/data/base/$(database_oid ${textsearch_db})/pgrn*"
+    fi
+  done
+}
+
+benchmark_create_index()
+{
+  benchmark_create_index_pgroonga
+  benchmark_create_index_pg_trgm
+  benchmark_create_index_textsearch
+}
+
+benchmark_search_pgroonga()
+{
+  work_mem_size='64MB'
+  work_mem="SET work_mem = '${work_mem_size}';"
+  search_path="SET search_path = \"\${user}\", public, pgroonga, pg_catalog;"
+  cat "${benchmark_dir}/en-search-words.list" | while read search_word; do
+    for i in $(seq ${n_search_tries}); do
+      where="text @@ '${search_word}'"
+      echo "PGroonga: search: work_mem(${work_mem_size}): ${where}: ${i}:"
+      time run sudo -u postgres -H psql -d ${pgroonga_db} \
+           --command "${work_mem} ${search_path} SELECT COUNT(*) FROM wikipedia WHERE ${where}"
+    done
+  done
+}
+
+benchmark_search_pg_trgm()
+{
+  work_mem_size='64MB'
+  work_mem="SET work_mem = '${work_mem_size}';"
+  cat "${benchmark_dir}/en-search-words.list" | while read search_word; do
+    for i in $(seq ${n_search_tries}); do
+      where="text LIKE '%${search_word}%'"
+      where=$(echo $where | sed -e "s/ OR /%' OR text LIKE '%/g")
+      echo "pg_trgm: search: work_mem(${work_mem_size}): ${where}: ${i}:"
+      time run sudo -u postgres -H psql -d ${pg_trgm_db} \
+           --command "${work_mem} SELECT COUNT(*) FROM wikipedia WHERE ${where}"
+    done
+  done
+}
+
+benchmark_search_textsearch()
+{
+  work_mem_size='64MB'
+  work_mem="SET work_mem = '${work_mem_size}';"
+  cat "${benchmark_dir}/en-search-words.list" | while read search_word; do
+    for i in $(seq ${n_search_tries}); do
+      where="text @@ '$(echo ${search_word} | sed -e 's/ OR / | /g')'"
+      echo "textsearch: search: work_mem(${work_mem_size}): ${where}: ${i}:"
+      time run sudo -u postgres -H psql -d ${textsearch_db} \
+           --command "${work_mem} SELECT COUNT(*) FROM wikipedia WHERE ${where}"
+    done
+  done
+}
+
+show_environment
+
+ensure_data
+
+setup_postgresql_repository
+setup_groonga_repository
+install_pgroonga
+install_pg_trgm
+install_textsearch
+
+setup_postgresql
+setup_benchmark_db
+load_data
+
+benchmark_create_index
+
+benchmark_search

  Modified: benchmark/centos7/ja-mysql.sh (+3 -3)
===================================================================
--- benchmark/centos7/ja-mysql.sh    2016-11-04 23:23:17 +0900 (a5b2215)
+++ benchmark/centos7/ja-mysql.sh    2016-11-05 00:12:44 +0900 (0e418ff)
@@ -244,7 +244,7 @@ benchmark_search_mroonga()
 {
   run sudo -H systemctl restart mysqld
 
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="MATCH(title, text) AGAINST('*D+ ${search_word}' IN BOOLEAN MODE)"
       echo "Mroonga: search: ${where}: ${i}:"
@@ -259,7 +259,7 @@ benchmark_search_innodb_ngram()
 {
   run sudo -H systemctl restart mysqld
 
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       query=$(echo ${search_word} | sed -e "s/ OR / /g")
       where="MATCH(title, text) AGAINST('${query}' IN BOOLEAN MODE)"
@@ -275,7 +275,7 @@ benchmark_search_innodb_mecab()
 {
   run sudo -H systemctl restart mysqld
 
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       query=$(echo ${search_word} | sed -e "s/ OR / /g")
       where="MATCH(title, text) AGAINST('${query}' IN BOOLEAN MODE)"

  Modified: benchmark/centos7/ja-postgresql.sh (+3 -3)
===================================================================
--- benchmark/centos7/ja-postgresql.sh    2016-11-04 23:23:17 +0900 (106dc79)
+++ benchmark/centos7/ja-postgresql.sh    2016-11-05 00:12:44 +0900 (f2207f1)
@@ -157,7 +157,7 @@ load_data_pg_bigm()
       "${config_dir}/schema.postgresql.sql"
   time run sudo -u postgres -H psql -d ${pg_bigm_db} \
        --command "COPY wikipedia FROM '${data_dir}/ja-all-pages.csv' WITH CSV ENCODING 'utf8'"
-  echo "pg_biggm: data: load: size:"
+  echo "pg_bigm: data: load: size:"
   run sudo -u postgres -H \
       sh -c "du -hsc /var/lib/pgsql/9.5/data/base/$(database_oid ${pg_bigm_db})/*"
 }
@@ -221,7 +221,7 @@ benchmark_search_pgroonga()
 
   work_mem_size='10MB'
   work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text @@ '${search_word}'"
       echo "PGroonga: search: ${where}: ${i}:"
@@ -237,7 +237,7 @@ benchmark_search_pg_bigm()
 
   work_mem_size='10MB'
   work_mem="SET work_mem = '${work_mem_size}';"
-  cat "${benchmark_dir}/search-words.list" | while read search_word; do
+  cat "${benchmark_dir}/ja-search-words.list" | while read search_word; do
     for i in $(seq ${n_search_tries}); do
       where="text LIKE '%${search_word}%'"
       where=$(echo $where | sed -e "s/ OR /%' OR text LIKE '%/g")

  Renamed: benchmark/en-search-words.list (+0 -0) 100%
===================================================================

  Renamed: benchmark/ja-search-words.list (+0 -0) 100%
===================================================================
-------------- next part --------------
HTML����������������������������...
ダウンロード 



More information about the Groonga-commit mailing list
アーカイブの一覧に戻る