1d3f9174c5
Using shared_ptr's in `unrecognized_entity_exception` can lead to cross-cpu deletion of a pointer which will trigger an assert `_cpu == std::this_thread::get_id()' when shared_ptr is disposed. Copy `column_identifier` to the exception object and avoid using an instance of `cql3::relation`: just get a string representation from it since nothing more is used in associated exception handling code. Fixes: #6287 Tests: unit(dev, debug), dtest(lwt_destructive_ddl_test.py:LwtDestructiveDDLTest.test_rename_column) Signed-off-by: Pavel Solodovnikov <pa.solodovnikov@scylladb.com> Message-Id: <20200506155714.150497-1-pa.solodovnikov@scylladb.com>
58 lines
2.0 KiB
C++
58 lines
2.0 KiB
C++
/*
|
|
* Licensed to the Apache Software Foundation (ASF) under one
|
|
* or more contributor license agreements. See the NOTICE file
|
|
* distributed with this work for additional information
|
|
* regarding copyright ownership. The ASF licenses this file
|
|
* to you 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.
|
|
*/
|
|
|
|
/*
|
|
* Copyright (C) 2015 ScyllaDB
|
|
*
|
|
* Modified by ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* This file is part of Scylla.
|
|
*
|
|
* Scylla is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Affero General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Scylla is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Scylla. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "relation.hh"
|
|
#include "exceptions/unrecognized_entity_exception.hh"
|
|
|
|
namespace cql3 {
|
|
|
|
const column_definition&
|
|
relation::to_column_definition(const schema& schema, const column_identifier::raw& entity) {
|
|
auto id = entity.prepare_column_identifier(schema);
|
|
auto def = get_column_definition(schema, *id);
|
|
if (!def || def->is_hidden_from_cql()) {
|
|
throw exceptions::unrecognized_entity_exception(*id, to_string());
|
|
}
|
|
return *def;
|
|
}
|
|
|
|
}
|