mirror of
https://github.com/scylladb/scylladb.git
synced 2026-04-26 19:35:12 +00:00
f96d25a0a7
in general, user should save output of `DESC foo.bar` to a file, and pass the path to the file as the argument of `--schema-file` option of `scylla sstable` commands. the CQL statement generated from `DESC` command always include the keyspace name of the table. but in case user create the CQL statement manually and misses the keyspace name. he/she would have following assertion failure ``` scylla: cql3/statements/cf_statement.cc:49: virtual const sstring &cql3::statements::raw::cf_statement::keyspace() const: Assertion `_cf_name->has_keyspace()' failed. ``` this is not a great user experience. so, in this change, we check for the existence of keyspace before looking it up. and throw a runtime error with a better error mesage. so when the CQL statement does not have the keyspace name, the new error message would look like: ``` error processing arguments: could not load schema via schema-file: std::runtime_error (tools::do_load_schemas(): CQL statement does not have keyspace specified) ``` since this check is only performed by `do_load_schemas()` which care about the existence of keyspace, and it only expects the CQL statement to create table/keyspace/type, we just override the new `has_keyspace()` method of the corresponding types derived from `cf_statement`. Signed-off-by: Kefu Chai <kefu.chai@scylladb.com> Closes scylladb/scylladb#16981
53 lines
931 B
C++
53 lines
931 B
C++
/*
|
|
* Copyright (C) 2014-present ScyllaDB
|
|
*
|
|
* Modified by ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "cql3/cf_name.hh"
|
|
|
|
#include <optional>
|
|
|
|
#include "parsed_statement.hh"
|
|
|
|
namespace service { class client_state; }
|
|
|
|
namespace cql3 {
|
|
|
|
namespace statements {
|
|
|
|
namespace raw {
|
|
|
|
/**
|
|
* Abstract class for statements that apply on a given column family.
|
|
*/
|
|
class cf_statement : public parsed_statement {
|
|
protected:
|
|
std::optional<cf_name> _cf_name;
|
|
|
|
cf_statement(std::optional<cf_name> cf_name);
|
|
public:
|
|
virtual void prepare_keyspace(const service::client_state& state);
|
|
|
|
// Only for internal calls, use the version with ClientState for user queries
|
|
void prepare_keyspace(std::string_view keyspace);
|
|
|
|
virtual bool has_keyspace() const;
|
|
|
|
virtual const sstring& keyspace() const;
|
|
|
|
virtual const sstring& column_family() const;
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|