mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-22 20:54:49 +09:00
M #: Fix index check (#4484)
This commit is contained in:
1 parent
591472fbb8
commit
81c7a10044
2 files changed
+30
-9
No files matched your search
@@ -97,13 +97,14 @@ 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",
|
||||
index_sql: [{ :name =>'state_oid_idx', :table => 'vm_pool', :columns => '(state, oid)' },
|
||||
{ :name =>'ftidx', :table => 'vm_pool', :columns => '(search_token)', :type => 'FULLTEXT' },
|
||||
{ :name =>'applied_idx', :table => 'logdb', :columns => '(applied)' },
|
||||
{ :name =>'fed_index_idx', :table => 'logdb', :columns => '(fed_index)' }],
|
||||
|
||||
index_sql: [{ :name =>'INDEX state_oid_idx', :table => 'vm_pool', :columns => '(state, oid)' },
|
||||
{ :name =>'INDEX ftidx', :table => 'vm_pool', :columns => '(search_token)', :type => 'FULLTEXT' },
|
||||
{ :name =>'INDEX applied_idx', :table => 'logdb', :columns => '(applied)' }],
|
||||
|
||||
index_sqlite: [{ :name =>'INDEX state_oid_idx', :table => 'vm_pool', :columns => '(state, oid)' },
|
||||
{ :name =>'INDEX applied_idx', :table => 'logdb', :columns => '(applied)' }]
|
||||
index_sqlite: [{ :name =>'state_oid_idx', :table => 'vm_pool', :columns => '(state, oid)' },
|
||||
{ :name =>'applied_idx', :table => 'logdb', :columns => '(applied)' },
|
||||
{ :name =>'fed_index_idx', :table => 'logdb', :columns => '(fed_index)' }]
|
||||
},
|
||||
"5.10.0" => {
|
||||
logdb: "log_index BIGINT UNSIGNED PRIMARY KEY, term INTEGER, sqlcmd MEDIUMTEXT, " <<
|
||||
|
||||
@@ -413,6 +413,11 @@ class BackEndMySQL < OneDBBacKEnd
|
||||
end
|
||||
end
|
||||
|
||||
def idx?(idx)
|
||||
query = "SHOW INDEX FROM #{idx[:table]} WHERE KEY_NAME = '#{idx[:name]}'"
|
||||
!@db.fetch(query).first.nil?
|
||||
end
|
||||
|
||||
def create_idx(version = nil)
|
||||
type = :index_sql
|
||||
|
||||
@@ -421,8 +426,11 @@ class BackEndMySQL < OneDBBacKEnd
|
||||
schema = get_schema(type, version)
|
||||
|
||||
schema.each do |idx|
|
||||
next if idx? idx
|
||||
|
||||
query = 'CREATE '
|
||||
query << idx[:type] if idx[:type]
|
||||
query << ' INDEX '
|
||||
query << " #{idx[:name]} ON #{idx[:table]} #{idx[:columns]};"
|
||||
|
||||
@db.run query
|
||||
@@ -439,7 +447,9 @@ class BackEndMySQL < OneDBBacKEnd
|
||||
return unless schema
|
||||
|
||||
schema.each do |idx|
|
||||
query = 'DROP '
|
||||
next unless idx? idx
|
||||
|
||||
query = 'DROP INDEX '
|
||||
query << "#{idx[:name]} ON #{idx[:table]} ;"
|
||||
|
||||
@db.run query
|
||||
@@ -574,13 +584,21 @@ class BackEndSQLite < OneDBBacKEnd
|
||||
puts "Sqlite database backup restored in #{@sqlite_file}"
|
||||
end
|
||||
|
||||
def idx?(idx)
|
||||
query = "SELECT * FROM sqlite_master WHERE type='index' AND name = '#{idx[:name]}'"
|
||||
|
||||
!@db.fetch(query).first.nil?
|
||||
end
|
||||
|
||||
def create_idx(version = nil)
|
||||
type = :index_sqlite
|
||||
|
||||
schema = get_schema(type, version)
|
||||
|
||||
schema.each do |idx|
|
||||
query = 'CREATE '
|
||||
next if idx? idx
|
||||
|
||||
query = 'CREATE INDEX '
|
||||
query << idx[:type] if idx[:type]
|
||||
query << " #{idx[:name]} ON #{idx[:table]} #{idx[:columns]};"
|
||||
|
||||
@@ -596,7 +614,9 @@ class BackEndSQLite < OneDBBacKEnd
|
||||
return unless schema
|
||||
|
||||
schema.each do |idx|
|
||||
query = 'DROP '
|
||||
next unless idx? idx
|
||||
|
||||
query = 'DROP INDEX '
|
||||
query << " #{idx[:name]};"
|
||||
|
||||
@db.run query
|
||||
|
||||
Reference in new issue
Block a user