b63d33526d
The "_specs" array contains column specifications that have the bind marker name if there is one. That results in get_partition_key_bind_indices() not being able to look up a column definition for such columns. Fix the issue by keeping track of the actual column specifications passed to add() like Cassandra does. Fixes #2369 Message-Id: <1494397358-24795-1-git-send-email-penberg@scylladb.com>
79 lines
2.6 KiB
C++
79 lines
2.6 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/>.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "cql3/column_specification.hh"
|
|
#include "cql3/column_identifier.hh"
|
|
|
|
#include <experimental/optional>
|
|
#include <vector>
|
|
|
|
namespace cql3 {
|
|
|
|
class variable_specifications final {
|
|
private:
|
|
std::vector<shared_ptr<column_identifier>> _variable_names;
|
|
std::vector<::shared_ptr<column_specification>> _specs;
|
|
std::vector<::shared_ptr<column_specification>> _target_columns;
|
|
|
|
public:
|
|
variable_specifications(const std::vector<::shared_ptr<column_identifier>>& variable_names);
|
|
|
|
/**
|
|
* Returns an empty instance of <code>VariableSpecifications</code>.
|
|
* @return an empty instance of <code>VariableSpecifications</code>
|
|
*/
|
|
static ::shared_ptr<variable_specifications> empty();
|
|
|
|
size_t size() const;
|
|
|
|
std::vector<::shared_ptr<column_specification>> get_specifications() const &;
|
|
|
|
std::vector<::shared_ptr<column_specification>> get_specifications() &&;
|
|
|
|
std::vector<uint16_t> get_partition_key_bind_indexes(schema_ptr schema) const;
|
|
|
|
void add(int32_t bind_index, ::shared_ptr<column_specification> spec);
|
|
};
|
|
|
|
}
|