From 0fbd5784eeb7da60344d643d938dbf54a29b2e77 Mon Sep 17 00:00:00 2001 From: Khosrow Afroozeh Date: Thu, 14 Dec 2023 16:05:26 +0100 Subject: [PATCH] [CLIENT-2721] Make PartitionFilter.Retry public --- partition_filter.go | 2 +- partition_tracker.go | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/partition_filter.go b/partition_filter.go index 919bb18c..b04e7052 100644 --- a/partition_filter.go +++ b/partition_filter.go @@ -35,7 +35,7 @@ type PartitionFilter struct { // Partitions encapsulates the cursor for the progress of the scan/query to be used for pagination. Partitions []*PartitionStatus Done bool - retry bool + Retry bool } // NewPartitionFilterAll creates a partition filter that diff --git a/partition_tracker.go b/partition_tracker.go index 5dbda064..c54052cd 100644 --- a/partition_tracker.go +++ b/partition_tracker.go @@ -107,11 +107,11 @@ func newPartitionTracker(policy *MultiPolicy, filter *PartitionFilter, nodes []* if len(filter.Partitions) == 0 { filter.Partitions = pt.initPartitions(policy, filter.Count, filter.Digest) - filter.retry = true + filter.Retry = true } else { // Retry all partitions when maxRecords not specified. if policy.MaxRecords <= 0 { - filter.retry = true + filter.Retry = true } // Reset replica sequence and last node used. @@ -173,7 +173,7 @@ func (pt *partitionTracker) assignPartitionsToNodes(cluster *Cluster, namespace } p := NewPartitionForReplicaPolicy(namespace, pt.replica) - retry := (pt.partitionFilter == nil || pt.partitionFilter.retry) && (pt.iteration == 1) + retry := (pt.partitionFilter == nil || pt.partitionFilter.Retry) && (pt.iteration == 1) for _, part := range pt.partitions { if retry || part.Retry { @@ -212,7 +212,7 @@ func (pt *partitionTracker) assignPartitionsToNodes(cluster *Cluster, namespace // Global retry will be set to false if the scan/query completes normally and maxRecords // is specified. if pt.partitionFilter != nil { - pt.partitionFilter.retry = true + pt.partitionFilter.Retry = true } pt.recordCount = nil @@ -311,7 +311,7 @@ func (pt *partitionTracker) isComplete(cluster *Cluster, policy *BasePolicy) (bo if partsUnavailable == 0 { if pt.maxRecords <= 0 { if pt.partitionFilter != nil { - pt.partitionFilter.retry = false + pt.partitionFilter.Retry = false pt.partitionFilter.Done = true } } else if pt.iteration > 1 { @@ -320,7 +320,7 @@ func (pt *partitionTracker) isComplete(cluster *Cluster, policy *BasePolicy) (bo // next iteration. If that node finally succeeds, the other original nodes still // need to be retried if partition state is reused in the next scan/query command. // Force retry on all node partitions. - pt.partitionFilter.retry = true + pt.partitionFilter.Retry = true pt.partitionFilter.Done = false } } else { @@ -339,7 +339,7 @@ func (pt *partitionTracker) isComplete(cluster *Cluster, policy *BasePolicy) (bo } if pt.partitionFilter != nil { - pt.partitionFilter.retry = false + pt.partitionFilter.Retry = false pt.partitionFilter.Done = done } } else { @@ -353,7 +353,7 @@ func (pt *partitionTracker) isComplete(cluster *Cluster, policy *BasePolicy) (bo } if pt.partitionFilter != nil { - pt.partitionFilter.retry = false + pt.partitionFilter.Retry = false pt.partitionFilter.Done = (recordCount == 0) } } @@ -438,7 +438,7 @@ func (pt *partitionTracker) markRetry(nodePartitions *nodePartitions) { func (pt *partitionTracker) partitionError() { // Mark all partitions for retry on fatal errors. if pt.partitionFilter != nil { - pt.partitionFilter.retry = true + pt.partitionFilter.Retry = true } }