a4a318f394
Our documentation states that writing an item with "USING TTL 0" means it should never expire. This should be true even if the table has a default TTL. But Scylla mistakenly handled "USING TTL 0" exactly like having no USING TTL at all (i.e., it took the default TTL, instead of unlimited). We had two xfailing tests demonstrating that Scylla's behavior in this is different from Cassandra. Scylla's behavior in this case was also undocumented. By the way, Cassandra used to have the same bug (CASSANDRA-11207) but it was fixed already in 2016 (Cassandra 3.6). So in this patch we fix Scylla's "USING TTL 0" behavior to match the documentation and Cassandra's behavior since 2016. One xfailing test starts to pass and the second test passes this bug and fails on a different one. This patch also adds a third test for "USING TTL ?" with UNSET_VALUE - it behaves, on both Scylla and Cassandra, like a missing "USING TTL". The origin of this bug was that after parsing the statement, we saved the USING TTL in an integer, and used 0 for the case of no USING TTL given. This meant that we couldn't tell if we have USING TTL 0 or no USING TTL at all. This patch uses an std::optional so we can tell the case of a missing USING TTL from the case of USING TTL 0. Fixes #6447 Signed-off-by: Nadav Har'El <nyh@scylladb.com> Closes #13079
71 lines
2.1 KiB
C++
71 lines
2.1 KiB
C++
/*
|
|
* Copyright (C) 2015-present ScyllaDB
|
|
*
|
|
* Modified by ScyllaDB
|
|
*/
|
|
|
|
/*
|
|
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "cql3/expr/expression.hh"
|
|
#include "cql3/expr/unset.hh"
|
|
#include "db/timeout_clock.hh"
|
|
|
|
namespace cql3 {
|
|
|
|
class query_options;
|
|
class prepare_context;
|
|
|
|
/**
|
|
* Utility class for the Parser to gather attributes for modification
|
|
* statements.
|
|
*/
|
|
class attributes final {
|
|
private:
|
|
expr::unset_bind_variable_guard _timestamp_unset_guard;
|
|
std::optional<cql3::expr::expression> _timestamp;
|
|
expr::unset_bind_variable_guard _time_to_live_unset_guard;
|
|
std::optional<cql3::expr::expression> _time_to_live;
|
|
std::optional<cql3::expr::expression> _timeout;
|
|
public:
|
|
static std::unique_ptr<attributes> none();
|
|
private:
|
|
attributes(std::optional<cql3::expr::expression>&& timestamp,
|
|
std::optional<cql3::expr::expression>&& time_to_live,
|
|
std::optional<cql3::expr::expression>&& timeout);
|
|
public:
|
|
bool is_timestamp_set() const;
|
|
|
|
bool is_time_to_live_set() const;
|
|
|
|
bool is_timeout_set() const;
|
|
|
|
int64_t get_timestamp(int64_t now, const query_options& options);
|
|
|
|
std::optional<int32_t> get_time_to_live(const query_options& options);
|
|
|
|
db::timeout_clock::duration get_timeout(const query_options& options) const;
|
|
|
|
void fill_prepare_context(prepare_context& ctx);
|
|
|
|
class raw final {
|
|
public:
|
|
std::optional<cql3::expr::expression> timestamp;
|
|
std::optional<cql3::expr::expression> time_to_live;
|
|
std::optional<cql3::expr::expression> timeout;
|
|
|
|
std::unique_ptr<attributes> prepare(data_dictionary::database db, const sstring& ks_name, const sstring& cf_name) const;
|
|
private:
|
|
lw_shared_ptr<column_specification> timestamp_receiver(const sstring& ks_name, const sstring& cf_name) const;
|
|
|
|
lw_shared_ptr<column_specification> time_to_live_receiver(const sstring& ks_name, const sstring& cf_name) const;
|
|
|
|
lw_shared_ptr<column_specification> timeout_receiver(const sstring& ks_name, const sstring& cf_name) const;
|
|
};
|
|
};
|
|
|
|
}
|