Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase database version to 5.10.0 #3277

Merged
merged 1 commit into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/Nebula.h
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ class Nebula
*/
static string shared_db_version()
{
return "5.6.0";
return "5.10.0";
}

/**
Expand All @@ -384,7 +384,7 @@ class Nebula
*/
static string local_db_version()
{
return "5.8.0";
return "5.10.0";
}

/**
Expand Down
5 changes: 3 additions & 2 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1499,7 +1499,8 @@ ONEDB_SHARED_MIGRATOR_FILES="src/onedb/shared/2.0_to_2.9.80.rb \
src/onedb/shared/5.3.80_to_5.4.0.rb \
src/onedb/shared/5.4.0_to_5.4.1.rb \
src/onedb/shared/5.4.1_to_5.5.80.rb \
src/onedb/shared/5.5.80_to_5.6.0.rb"
src/onedb/shared/5.5.80_to_5.6.0.rb \
src/onedb/shared/5.6.0_to_5.10.0.rb"

ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \
src/onedb/local/4.7.80_to_4.9.80.rb \
Expand All @@ -1515,7 +1516,7 @@ ONEDB_LOCAL_MIGRATOR_FILES="src/onedb/local/4.5.80_to_4.7.80.rb \
src/onedb/local/5.5.80_to_5.6.0.rb \
src/onedb/local/5.6.0_to_5.7.80.rb \
src/onedb/local/5.7.80_to_5.8.0.rb \
src/onedb/local/5.8.0_to_5.9.80.rb"
src/onedb/local/5.8.0_to_5.10.0.rb"

ONEDB_PATCH_FILES="src/onedb/patches/4.14_monitoring.rb \
src/onedb/patches/history_times.rb"
Expand Down
4 changes: 2 additions & 2 deletions src/onedb/database_schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ class OneDBBacKEnd
index_sqlite: ["CREATE INDEX state_oid_idx ON vm_pool (state, oid);",
"CREATE INDEX applied_idx ON logdb (applied);"]
},
"5.9.80" => {
"5.10.0" => {
logdb: "log_index BIGINT UNSIGNED PRIMARY KEY, term INTEGER, sqlcmd MEDIUMTEXT, " <<
"timestamp INTEGER, fed_index BIGINT UNSIGNED, applied BOOLEAN"
}
}

LATEST_DB_VERSION = "5.9.80"
LATEST_DB_VERSION = "5.10.0"

def get_schema(type, version = nil)
if !version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
module Migrator

def db_version
'5.9.80'
'5.10.0'
end

def one_version
Expand Down
33 changes: 33 additions & 0 deletions src/onedb/shared/5.6.0_to_5.10.0.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# -------------------------------------------------------------------------- #
# Copyright 2002-2019, OpenNebula Project, OpenNebula Systems #
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
# not use this file except in compliance with the License. You may obtain #
# a copy of the License at #
# #
# http://www.apache.org/licenses/LICENSE-2.0 #
# #
# Unless required by applicable law or agreed to in writing, software #
# distributed under the License is distributed on an "AS IS" BASIS, #
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
# See the License for the specific language governing permissions and #
# limitations under the License. #
#--------------------------------------------------------------------------- #

include OpenNebula

module Migrator

def db_version
'5.10.0'
end

def one_version
'OpenNebula 5.9.80'
end

def up
true
end

end