diff --git a/src/onedb/database_schema.rb b/src/onedb/database_schema.rb index 7b13dfde74..a237bc27b1 100644 --- a/src/onedb/database_schema.rb +++ b/src/onedb/database_schema.rb @@ -98,12 +98,12 @@ class OneDBBacKEnd "body MEDIUMTEXT, uid INTEGER, gid INTEGER," << "owner_u INTEGER, group_u INTEGER, other_u INTEGER", - index_sql: ["CREATE INDEX IF NOT EXISTS state_oid_idx ON vm_pool (state, oid);", - "CREATE FULLTEXT INDEX IF NOT EXISTS ftidx ON vm_pool(search_token);", - "CREATE INDEX IF NOT EXISTS applied_idx ON logdb (applied);"], + 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: ["CREATE INDEX IF NOT EXISTS state_oid_idx ON vm_pool (state, oid);", - "CREATE INDEX IF NOT EXISTS applied_idx ON logdb (applied);"] + index_sqlite: [{ :name =>'INDEX state_oid_idx', :table => 'vm_pool', :columns => '(state, oid)' }, + { :name =>'INDEX applied_idx', :table => 'logdb', :columns => '(applied)' }] }, "5.10.0" => { logdb: "log_index BIGINT UNSIGNED PRIMARY KEY, term INTEGER, sqlcmd MEDIUMTEXT, " << @@ -163,11 +163,6 @@ class OneDBBacKEnd schema = SCHEMA[type] if !schema - if !schema - STDERR.puts "Schema not found (#{type}) for version #{version}" - exit(-1) - end - schema end diff --git a/src/onedb/onedb.rb b/src/onedb/onedb.rb index a1c6939ea4..d3758f9973 100644 --- a/src/onedb/onedb.rb +++ b/src/onedb/onedb.rb @@ -151,6 +151,9 @@ class OneDB begin timea = Time.now + # Delete indexes + @backend.delete_idx db_version[:version] + # Upgrade shared (federation) tables, only for standalone and master if !db_version[:is_slave] puts diff --git a/src/onedb/onedb_backend.rb b/src/onedb/onedb_backend.rb index c491afce4e..562fa2d535 100644 --- a/src/onedb/onedb_backend.rb +++ b/src/onedb/onedb_backend.rb @@ -421,7 +421,28 @@ class BackEndMySQL < OneDBBacKEnd schema = get_schema(type, version) schema.each do |idx| - @db.run idx + query = 'CREATE ' + query << idx[:type] if idx[:type] + query << " #{idx[:name]} ON #{idx[:table]} #{idx[:columns]};" + + @db.run query + end + end + + def delete_idx(version = nil) + type = :index_sql + + type = :index_sqlite unless @db.server_version >= 50600 + + schema = get_schema(type, version) + + return unless schema + + schema.each do |idx| + query = 'DROP ' + query << "#{idx[:name]} ON #{idx[:table]} ;" + + @db.run query end end @@ -559,7 +580,24 @@ class BackEndSQLite < OneDBBacKEnd schema = get_schema(type, version) schema.each do |idx| - @db.run idx + query = 'CREATE ' + query << idx[:type] if idx[:type] + query << " #{idx[:name]} ON #{idx[:table]} #{idx[:columns]};" + + @db.run query + end + end + + def delete_idx(version = nil) + type = :index_sqlite + + schema = get_schema(type, version) + + schema.each do |idx| + query = 'DROP ' + query << " #{idx[:name]};" + + @db.run query end end