NCBC-4068: Recent failures in txns

Motivation
==========
Transactions regressions need a quick look

Motification
============
Recently, the new (in 8.0) SubdocAccessDeleted flag was supported.
This means we can access deleted documents using replica reads. But
this was a bit mixed with the ordinary 'CreateAsDeleted' capability
that we have always used for transactions to create tombstone docs
when inserting and so on.   What we need to do is only set the
AccessDeleted flag to true on replica reads if the server supports
it.  Small change to do so.

Also renamed it SubdocAccessDeleted for some disambiguation.

Results
=======
Transactions fails now gone.

Change-Id: Ie407fd6ac78da602a5b870b59a46bab4b29ca33b
Reviewed-on: https://review.couchbase.org/c/couchbase-net-client/+/234627
Reviewed-by: Michael Reiche <michael.reiche@couchbase.com>
Tested-by: Build Bot <build@couchbase.com>

Author: davidkelly

src/Couchbase/KeyValue/CouchbaseCollection.cs

@@ -72,7 +72,7 @@ internal CouchbaseCollection(BucketBase bucket, IOperationConfigurator operation
 
             if (_bucket is CouchbaseBucket couchBucket)
             {
-                AccessDeleted = couchBucket.CurrentConfig?.BucketCapabilities.Contains(BucketCapabilities
+                SubdocAccessDeleted = couchBucket.CurrentConfig?.BucketCapabilities.Contains(BucketCapabilities
                     .SUBDOC_ACCESS_DELETED) == true;
             }
         }
@@ -100,7 +100,7 @@ internal CouchbaseCollection(BucketBase bucket, IOperationConfigurator operation
         public bool IsDefaultCollection { get; }
 
         /// <inheritdoc />
-        public bool AccessDeleted { get; }
+        public bool SubdocAccessDeleted { get; }
 
         #region KV Range Scan
 
@@ -954,14 +954,22 @@ private async Task<MultiLookup<byte[]>> ExecuteLookupIn(string id, IEnumerable<L
                     }
                 });
             }
+            // if we are a replica read _and_ wanting access deleted, we have to be sure to
+            // check that AccessDeleted is "fully" supported...
+            var docFlags = options.AccessDeleted ? SubdocDocFlags.AccessDeleted : SubdocDocFlags.None;
+            docFlags |= options.ReplicaIndex.HasValue ? SubdocDocFlags.ReplicaRead : SubdocDocFlags.None;
+            if (options is { AccessDeleted: true, ReplicaIndex: not null } && !SubdocAccessDeleted)
+            {
+                docFlags &= ~SubdocDocFlags.AccessDeleted;
+            }
 
             var lookup = new MultiLookup<byte[]>(id, specs, options.ReplicaIndex)
             {
                 Cid = Cid,
                 BucketName = _bucket.Name,
                 CName = Name,
                 SName = ScopeName,
-                DocFlags = options.AccessDeleted && AccessDeleted ? SubdocDocFlags.AccessDeleted : (options.ReplicaIndex.HasValue ? SubdocDocFlags.ReplicaRead : SubdocDocFlags.None),
+                DocFlags = docFlags,
                 Span = span,
                 PreferReturns = options.PreferReturn,
             };
@@ -1021,10 +1029,7 @@ public async Task<IMutateInResult> MutateInAsync(string id, IEnumerable<MutateIn
                     docFlags |= SubdocDocFlags.InsertDocument;
                     break;
                 case StoreSemantics.AccessDeleted:
-                    if (AccessDeleted)
-                    {
-                        docFlags |= SubdocDocFlags.AccessDeleted;
-                    }
+                    docFlags |= SubdocDocFlags.AccessDeleted;
                     break;
                 default:
                     throw new ArgumentOutOfRangeException();
@@ -1045,7 +1050,7 @@ public async Task<IMutateInResult> MutateInAsync(string id, IEnumerable<MutateIn
                 docFlags |= SubdocDocFlags.ReviveDocument | SubdocDocFlags.AccessDeleted;
             }
 
-            if (options.AccessDeletedValue && AccessDeleted) docFlags |= SubdocDocFlags.AccessDeleted;
+            if (options.AccessDeletedValue ) docFlags |= SubdocDocFlags.AccessDeleted;
 
             using var rootSpan = RootSpan(OuterRequestSpans.ServiceSpan.Kv.MutateIn, options.RequestSpanValue);
             using var mutation = new MultiMutation<byte[]>(id, specs)

src/Couchbase/KeyValue/ICouchbaseCollection.cs

@@ -42,7 +42,7 @@ public interface ICouchbaseCollection
         /// <summary>
         /// Returns true if the bucket supports accessDeleted.
         /// </summary>
-        public bool AccessDeleted  { get; }
+        public bool SubdocAccessDeleted  { get; }
 
         #region Basic
 

src/Couchbase/Stellar/KeyValue/StellarCollection.cs

@@ -76,7 +76,7 @@ public StellarCollection(string collectionName, StellarScope stellarScope, Stell
 
     public bool IsDefaultCollection { get; }
 
-    public bool AccessDeleted => false;
+    public bool SubdocAccessDeleted => false;
 
     public ICollectionQueryIndexManager QueryIndexes => _stellarCollectionQueryIndexes;
 

tests/Couchbase.Transactions.Tests.UnitTests/Mocks/MockCollection.cs

@@ -14,7 +14,7 @@ namespace Couchbase.Transactions.Tests.UnitTests.Mocks
     internal class MockCollection : ICouchbaseCollection
     {
         public Dictionary<string, TransactionGetResult> AllDocs { get; }
-        public bool AccessDeleted => false;
+        public bool SubdocAccessDeleted => false;
         public MockCollection(IEnumerable<TransactionGetResult> mockDocs)
         {
             AllDocs = mockDocs.ToDictionary(o => o.Id);
@@ -170,7 +170,7 @@ public MockCollectionWithNames(string collectionName, string scopeName, string b
 
         public uint? Cid => throw new NotImplementedException();
 
-        public bool AccessDeleted => false;
+        public bool SubdocAccessDeleted => false;
 
         public string Name { get; }
 

tests/Couchbase.UnitTests/Core/Diagnostics/Tracing/Fakes/FakeCollection.cs

@@ -30,7 +30,7 @@ public FakeCollection(string name, IScope scope, IBucket bucket, ClusterOptions
         public IScope Scope { get; }
         public IBinaryCollection Binary { get; } = null!;
         public bool IsDefaultCollection => Scope.IsDefaultScope && Name == "_default";
-        public bool AccessDeleted => false;
+        public bool SubdocAccessDeleted => false;
 
         public Task<IGetResult> GetAsync(string id, GetOptions? options = null)
         {