From 13c83c99c2ec1599d4d446d1b8ef4e1478d3675c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Thu, 14 Feb 2019 16:57:38 +0100 Subject: [PATCH] F #2930 Improve VM_POOL table queries filtering by STATE (#2946) --- src/onedb/database_schema.rb | 24 +++++++++++++++++------- src/onedb/local/5.6.0_to_5.7.80.rb | 27 ++++++++++++--------------- src/vm/VirtualMachine.cc | 2 +- 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/src/onedb/database_schema.rb b/src/onedb/database_schema.rb index 2c9f8649a3..af6e9a0c7e 100644 --- a/src/onedb/database_schema.rb +++ b/src/onedb/database_schema.rb @@ -89,12 +89,6 @@ class OneDBBacKEnd "5.6.0" => {}, "5.7.80" => { vm_pool: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << - "body MEDIUMTEXT, uid INTEGER, gid INTEGER, " << - "last_poll INTEGER, state INTEGER, lcm_state INTEGER, " << - "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT, " << - "search_token MEDIUMTEXT, FULLTEXT ftidx(search_token)", - - vm_pool_sqlite: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << "body MEDIUMTEXT, uid INTEGER, gid INTEGER, " << "last_poll INTEGER, state INTEGER, lcm_state INTEGER, " << "owner_u INTEGER, group_u INTEGER, other_u INTEGER, short_body MEDIUMTEXT, " << @@ -102,7 +96,12 @@ class OneDBBacKEnd vn_template_pool: "oid INTEGER PRIMARY KEY, name VARCHAR(128), " << "body MEDIUMTEXT, uid INTEGER, gid INTEGER," << - "owner_u INTEGER, group_u INTEGER, other_u INTEGER" + "owner_u INTEGER, group_u INTEGER, other_u INTEGER", + + index_sql: ["CREATE INDEX state_oid_idx ON vm_pool (state, oid);", + "CREATE FULLTEXT INDEX ftidx ON vm_pool(search_token)"], + + index_sqlite: ["CREATE INDEX state_oid_idx ON vm_pool (state, oid);"] } } @@ -163,5 +162,16 @@ class OneDBBacKEnd @db.run sql end + + def create_idx(type, version = nil) + + schema = get_schema(type, version) + + schema.each do |idx| + @db.run idx + end + + end + end diff --git a/src/onedb/local/5.6.0_to_5.7.80.rb b/src/onedb/local/5.6.0_to_5.7.80.rb index 1e2fdef924..0781aa6109 100644 --- a/src/onedb/local/5.6.0_to_5.7.80.rb +++ b/src/onedb/local/5.6.0_to_5.7.80.rb @@ -40,6 +40,7 @@ module Migrator feature_2253 feature_2489_2671 feature_826 + create_idxs true end @@ -75,11 +76,7 @@ module Migrator @db.run 'DROP TABLE IF EXISTS old_vm_pool;' @db.run 'ALTER TABLE vm_pool RENAME TO old_vm_pool;' - if !is_fts_available - create_table(:vm_pool_sqlite, "vm_pool", db_version) - else - create_table(:vm_pool, nil, db_version) - end + create_table(:vm_pool) @db.transaction do # updates VM's nics @@ -113,11 +110,7 @@ module Migrator @db.run 'DROP TABLE IF EXISTS old_vm_pool;' @db.run 'ALTER TABLE vm_pool RENAME TO old_vm_pool;' - if !is_fts_available - create_table(:vm_pool_sqlite, "vm_pool", db_version) - else - create_table(:vm_pool, nil, db_version) - end + create_table(:vm_pool) @db.transaction do @db.fetch('SELECT * FROM old_vm_pool') do |row| @@ -366,11 +359,7 @@ module Migrator @db.run "DROP TABLE IF EXISTS old_vm_pool;" @db.run "ALTER TABLE vm_pool RENAME TO old_vm_pool;" - if !is_fts_available - create_table(:vm_pool_sqlite, "vm_pool", db_version) - else - create_table(:vm_pool, nil, db_version) - end + create_table(:vm_pool) @db.transaction do @db.fetch("SELECT * FROM old_vm_pool") do |row| @@ -405,4 +394,12 @@ module Migrator @db.run "DROP TABLE old_vm_pool;" end + + def create_idxs + if !is_fts_available + create_idx(:index_sqlite, db_version) + else + create_idx(:index_sql, db_version) + end + end end diff --git a/src/vm/VirtualMachine.cc b/src/vm/VirtualMachine.cc index 3d284c1a02..68ad2b869d 100644 --- a/src/vm/VirtualMachine.cc +++ b/src/vm/VirtualMachine.cc @@ -506,7 +506,7 @@ int VirtualMachine::bootstrap(SqlDB * db) ostringstream oss_hist(History::db_bootstrap); ostringstream oss_showback(VirtualMachine::showback_db_bootstrap); - ostringstream oss_index("CREATE INDEX state_idx on vm_pool (state);"); + ostringstream oss_index("CREATE INDEX state_oid_idx on vm_pool (state, oid);"); rc = db->exec_local_wr(oss_vm); rc += db->exec_local_wr(oss_index);