Skip to content
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.

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

RCBC-461: Call extract_expiry_time in to_backend of options instead of constructor #124

Merged
merged 1 commit into from Nov 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions lib/couchbase/options.rb
Expand Up @@ -585,7 +585,7 @@ def initialize(expiry: nil,
client_context: nil,
parent_span: nil)
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
@transcoder = transcoder
if durability_level != :none && (replicate_to != :none || persist_to != :none)
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
Expand All @@ -601,7 +601,7 @@ def initialize(expiry: nil,
def to_backend
{
timeout: Utils::Time.extract_duration(@timeout),
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
durability_level: @durability_level,
persist_to: @persist_to,
replicate_to: @replicate_to,
Expand Down Expand Up @@ -668,7 +668,7 @@ def initialize(expiry: nil,
client_context: nil,
parent_span: nil)
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
@preserve_expiry = preserve_expiry
@transcoder = transcoder
if durability_level != :none && (replicate_to != :none || persist_to != :none)
Expand All @@ -684,7 +684,7 @@ def initialize(expiry: nil,
def to_backend
{
timeout: Utils::Time.extract_duration(@timeout),
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
preserve_expiry: @preserve_expiry,
durability_level: @durability_level,
persist_to: @persist_to,
Expand Down Expand Up @@ -752,7 +752,7 @@ def initialize(expiry: nil,
client_context: nil,
parent_span: nil)
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
@preserve_expiry = preserve_expiry
@transcoder = transcoder
if durability_level != :none && (replicate_to != :none || persist_to != :none)
Expand All @@ -768,7 +768,7 @@ def initialize(expiry: nil,
def to_backend
{
timeout: Utils::Time.extract_duration(@timeout),
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
preserve_expiry: @preserve_expiry,
durability_level: @durability_level,
persist_to: @persist_to,
Expand Down Expand Up @@ -839,7 +839,7 @@ def initialize(expiry: nil,
client_context: nil,
parent_span: nil)
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
@preserve_expiry = preserve_expiry
@transcoder = transcoder
@cas = cas
Expand All @@ -856,7 +856,7 @@ def initialize(expiry: nil,
def to_backend
{
timeout: Utils::Time.extract_duration(@timeout),
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
preserve_expiry: @preserve_expiry,
durability_level: @durability_level,
persist_to: @persist_to,
Expand Down Expand Up @@ -938,7 +938,7 @@ def initialize(expiry: nil,
client_context: nil,
parent_span: nil)
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
@preserve_expiry = preserve_expiry
@store_semantics = store_semantics
@cas = cas
Expand All @@ -959,7 +959,7 @@ def initialize(expiry: nil,
def to_backend
{
timeout: Utils::Time.extract_duration(@timeout),
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
preserve_expiry: @preserve_expiry,
durability_level: @durability_level,
persist_to: @persist_to,
Expand Down Expand Up @@ -1386,7 +1386,7 @@ def initialize(delta: 1,
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@delta = delta
@initial = initial
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
if durability_level != :none && (replicate_to != :none || persist_to != :none)
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
end
Expand All @@ -1410,7 +1410,7 @@ def to_backend
timeout: Utils::Time.extract_duration(@timeout),
delta: @delta,
initial_value: @initial,
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
durability_level: @durability_level,
persist_to: @persist_to,
replicate_to: @replicate_to,
Expand Down Expand Up @@ -1480,7 +1480,7 @@ def initialize(delta: 1,
super(timeout: timeout, retry_strategy: retry_strategy, client_context: client_context, parent_span: parent_span)
@delta = delta
@initial = initial
@expiry = Utils::Time.extract_expiry_time(expiry)
@expiry = expiry
if durability_level != :none && (replicate_to != :none || persist_to != :none)
raise ArgumentError, "durability_level conflicts with replicate_to and persist_to options"
end
Expand All @@ -1504,7 +1504,7 @@ def to_backend
timeout: Utils::Time.extract_duration(@timeout),
delta: @delta,
initial_value: @initial,
expiry: @expiry,
expiry: Utils::Time.extract_expiry_time(@expiry),
durability_level: @durability_level,
persist_to: @persist_to,
replicate_to: @replicate_to,
Expand Down