Skip to content

Formatting nits #541

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.

Sign up for GitHub

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

Closed
szarnyasg wants to merge 1 commit into from
Closed

Formatting nits #541

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/storage/ducklake_initializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ void DuckLakeInitializer::InitializeNewDuckLake(DuckLakeTransaction &transaction
auto &metadata_catalog = Catalog::GetCatalog(*transaction.GetConnection().context, options.metadata_database);
if (!metadata_catalog.IsDuckCatalog()) {
throw InvalidInputException(
"Attempting to create a new ducklake instance but data_path is not set - set the "
"Attempting to create a new DuckLake instance but DATA_PATH is not set - set the "
"DATA_PATH parameter to the desired location of the data files");
}
// for DuckDB instances - use a default data path
Expand All @@ -142,17 +142,17 @@ void DuckLakeInitializer::InitializeNewDuckLake(DuckLakeTransaction &transaction
}

void DuckLakeInitializer::LoadExistingDuckLake(DuckLakeTransaction &transaction) {
// load the data path from the existing duck lake
// load the data path from the existing DuckLake
auto &metadata_manager = transaction.GetMetadataManager();
auto metadata = metadata_manager.LoadDuckLake();
for (auto &tag : metadata.tags) {
if (tag.key == "version") {
string version = tag.value;
if (version != "0.3" && !options.migrate_if_required) {
// Throw when Loading the Ducklake if a Migration is required and migrate_if_required option is false
throw InvalidInputException("DuckLake Extension requires a DuckLake Catalog version of 0.3 or "
// Throw when loading the DuckLake if a migration is required and MIGRATE_IF_REQUIRED option is false
throw InvalidInputException("The DuckLake extension requires a DuckLake catalog version of 0.3 or "
"higher, current version is %s "
"and migrate_if_required is set to false",
"and MIGRATE_IF_REQUIRED is set to false",
version);
}
if (version == "0.1") {
Expand Down Expand Up @@ -183,8 +183,8 @@ void DuckLakeInitializer::LoadExistingDuckLake(DuckLakeTransaction &transaction)
// verify that they match if override_data_path is not set to true
if (metadata_manager.StorePath(options.data_path) != tag.value && !options.override_data_path) {
throw InvalidConfigurationException(
"DATA_PATH parameter \"%s\" does not match existing data path in the catalog \"%s\".\nYou can "
"override the DATA_PATH by setting OVERRIDE_DATA_PATH to True.",
"DATA_PATH parameter \"%s\" does not match existing DATA_PATH in the catalog \"%s\".\nYou can "
"override the DATA_PATH by setting OVERRIDE_DATA_PATH to true.",
options.data_path, tag.value);
}
}
Expand Down
Loading