Merge #66002 #67747 #67764 #67823 #67830

66002: sql: support range based lookup join spans r=cucaroach a=cucaroach sql: support range based lookup join spans Informs #51576 If filters exist on a lookup join that match columns that we are doing the lookup against add them to the lookupExpr in the join reader spec and build those filters into the multispan generator. If we have inequality conditions we need to be able to lookup of the prefix for keys found against range spans and not just point spans so build a sorted slice of span+inputRowIndices we can binary search on. Issue #51576 also encompasses allowing inequalities on columns from the index to reference columns from the input, that will come in a later commit. Release note (sql change): Improve performance of lookup joins in some cases. If join inequality conditions can be matched to index columns include the conditions in the index lookup spans and remove them from the runtime filters. 67747: vendor: bump Pebble to 8c3bd06debb5 r=bananabrick a=jbowens ``` 8c3bd06d vfs: export ErrUnsupported b8b89851 tool: add manifest summarize command 8ac9797e internal/manifest: Move Atomic field in the FileMetaData struct to the top. b8f537d8 compaction: remove nonzero-seqnum splitting logic 5c39ff26 benchmarks: infrastructure to set up file system benchmarks ``` Release note: None 67764: colexecwindow: implement first_value, last_value, and nth_value r=DrewKimball a=DrewKimball **logictest: add testfile to ensure that window functions are vectorized** This commit adds a logic testfile that executes the window functions currently supported by the vectorized engine with `SET vectorize = experimental_always`. This tests that supported window functions can actually be executed in the vectorized engine. Release note: None **colexecwindow: add first_value, last_value, and nth_value** This patch adds vectorized implementations of the `first_value`, `last_value`, and `nth_value` window functions. These functions return an expression evaluated at the first, last, and nth positions respectively in the window frame for the current row. Release note (sql change): first_value, last_value, and nth_value window functions can now be executed in the vectorized engine. This allows for faster execution time, and also removes the need for conversions to and from row format. **colexecwindow: test window framer with different memory limits** Previously, the `TestWindowFramer` used `math.MaxInt64` as the memory limit for the `SpillingBuffer` used to buffer all tuples in a partition. This patch modifies the test to choose a random memory limit and fixes a bug that could cause `windowFramer` operators to skip a peer group when seeking to frame start and end indexes in `RANGE` or `GROUPS` mode. Release note: None **colexec: add range check for binary operations with timestamps** This commit adds a range check after additions or subtractions that produce a timestamp result. This ensures that the vectorized engine produces the same error as the row engine when the result of the operation is out of range. Release note: None Fixes #37035 67823: cloud: bump orchestrator version to 21.1.6 r=j-low a=j-low Release note: None 67830: roachtest: bump predecessor to v21.1.6 r=j-low a=j-low Release note: None Co-authored-by: Tommy Reilly <treilly@cockroachlabs.com> Co-authored-by: Jackson Owens <jackson@cockroachlabs.com> Co-authored-by: Drew Kimball <drewk@cockroachlabs.com> Co-authored-by: Joseph Lowinske <joe@cockroachlabs.com>
cockroachdb · Jul 20, 2021 · e45a521 · e45a521
6 parents 44d0c6f + 649d66b + cfa4ac8 + 025b697 + 5067a71 + 52b58e7
commit e45a521
Show file tree

Hide file tree

Showing 82 changed files with 5,957 additions and 1,395 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -628,8 +628,8 @@ def go_deps():
         name = "com_github_cockroachdb_pebble",
         build_file_proto_mode = "disable_global",
         importpath = "github.com/cockroachdb/pebble",
-        sum = "h1:5qIOzg4DH0pJqNFV5KyqtfIJalHGorKbsMQlog8sO1g=",
-        version = "v0.0.0-20210712141052-2215b8d4c8ab",
+        sum = "h1:Igd6YmtOZ77EgLAIaE9+mHl7+sAKaZ5m4iMI0Dz/J2A=",
+        version = "v0.0.0-20210719141320-8c3bd06debb5",
     )
 
     go_repository(

diff --git a/Makefile b/Makefile
@@ -879,9 +879,12 @@ EXECGEN_TARGETS = \
   pkg/sql/colexec/colexecsel/default_cmp_sel_ops.eg.go \
   pkg/sql/colexec/colexecsel/selection_ops.eg.go \
   pkg/sql/colexec/colexecsel/sel_like_ops.eg.go \
+  pkg/sql/colexec/colexecwindow/first_value.eg.go \
   pkg/sql/colexec/colexecwindow/lag.eg.go \
+  pkg/sql/colexec/colexecwindow/last_value.eg.go \
   pkg/sql/colexec/colexecwindow/lead.eg.go \
   pkg/sql/colexec/colexecwindow/ntile.eg.go \
+  pkg/sql/colexec/colexecwindow/nth_value.eg.go \
   pkg/sql/colexec/colexecwindow/range_offset_handler.eg.go \
   pkg/sql/colexec/colexecwindow/rank.eg.go \
   pkg/sql/colexec/colexecwindow/relative_rank.eg.go \

diff --git a/cloud/kubernetes/bring-your-own-certs/client.yaml b/cloud/kubernetes/bring-your-own-certs/client.yaml
@@ -19,7 +19,7 @@ spec:
   serviceAccountName: cockroachdb
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v21.1.5
+    image: cockroachdb/cockroach:v21.1.6
     # Keep a pod open indefinitely so kubectl exec can be used to get a shell to it
     # and run cockroach client commands, such as cockroach sql, cockroach node status, etc.
     command:

diff --git a/cloud/kubernetes/bring-your-own-certs/cockroachdb-statefulset.yaml b/cloud/kubernetes/bring-your-own-certs/cockroachdb-statefulset.yaml
@@ -152,7 +152,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/client-secure.yaml b/cloud/kubernetes/client-secure.yaml
@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v21.1.5
+    image: cockroachdb/cockroach:v21.1.6
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

diff --git a/cloud/kubernetes/cluster-init-secure.yaml b/cloud/kubernetes/cluster-init-secure.yaml
@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

diff --git a/cloud/kubernetes/cluster-init.yaml b/cloud/kubernetes/cluster-init.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

diff --git a/cloud/kubernetes/cockroachdb-statefulset-secure.yaml b/cloud/kubernetes/cockroachdb-statefulset-secure.yaml
@@ -194,7 +194,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/cockroachdb-statefulset.yaml b/cloud/kubernetes/cockroachdb-statefulset.yaml
@@ -97,7 +97,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/multiregion/client-secure.yaml b/cloud/kubernetes/multiregion/client-secure.yaml
@@ -8,7 +8,7 @@ spec:
   serviceAccountName: cockroachdb
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v21.1.5
+    image: cockroachdb/cockroach:v21.1.6
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

diff --git a/cloud/kubernetes/multiregion/cluster-init-secure.yaml b/cloud/kubernetes/multiregion/cluster-init-secure.yaml
@@ -10,7 +10,7 @@ spec:
       serviceAccountName: cockroachdb
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

diff --git a/cloud/kubernetes/multiregion/cockroachdb-statefulset-secure.yaml b/cloud/kubernetes/multiregion/cockroachdb-statefulset-secure.yaml
@@ -166,7 +166,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/cloud/kubernetes/multiregion/eks/cockroachdb-statefulset-secure-eks.yaml b/cloud/kubernetes/multiregion/eks/cockroachdb-statefulset-secure-eks.yaml
@@ -184,7 +184,7 @@ spec:
           name: cockroach-env
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/performance/cockroachdb-daemonset-insecure.yaml b/cloud/kubernetes/performance/cockroachdb-daemonset-insecure.yaml
@@ -81,7 +81,7 @@ spec:
       hostNetwork: true
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: If you configured taints to give CockroachDB exclusive access to nodes, feel free
         # to remove the requests and limits sections. If you didn't, you'll need to change these to

diff --git a/cloud/kubernetes/performance/cockroachdb-daemonset-secure.yaml b/cloud/kubernetes/performance/cockroachdb-daemonset-secure.yaml
@@ -197,7 +197,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: If you configured taints to give CockroachDB exclusive access to nodes, feel free
         # to remove the requests and limits sections. If you didn't, you'll need to change these to

diff --git a/cloud/kubernetes/performance/cockroachdb-statefulset-insecure.yaml b/cloud/kubernetes/performance/cockroachdb-statefulset-insecure.yaml
@@ -140,7 +140,7 @@ spec:
       - name: cockroachdb
         # NOTE: Always use the most recent version of CockroachDB for the best
         # performance and reliability.
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml b/cloud/kubernetes/performance/cockroachdb-statefulset-secure.yaml
@@ -231,7 +231,7 @@ spec:
       - name: cockroachdb
         # NOTE: Always use the most recent version of CockroachDB for the best
         # performance and reliability.
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         # TODO: Change these to appropriate values for the hardware that you're running. You can see
         # the resources that can be allocated on each of your Kubernetes nodes by running:

diff --git a/cloud/kubernetes/v1.6/client-secure.yaml b/cloud/kubernetes/v1.6/client-secure.yaml
@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v21.1.5
+    image: cockroachdb/cockroach:v21.1.6
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

diff --git a/cloud/kubernetes/v1.6/cluster-init-secure.yaml b/cloud/kubernetes/v1.6/cluster-init-secure.yaml
@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

diff --git a/cloud/kubernetes/v1.6/cluster-init.yaml b/cloud/kubernetes/v1.6/cluster-init.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

diff --git a/cloud/kubernetes/v1.6/cockroachdb-statefulset-secure.yaml b/cloud/kubernetes/v1.6/cockroachdb-statefulset-secure.yaml
@@ -177,7 +177,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/cloud/kubernetes/v1.6/cockroachdb-statefulset.yaml b/cloud/kubernetes/v1.6/cockroachdb-statefulset.yaml
@@ -80,7 +80,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/cloud/kubernetes/v1.7/client-secure.yaml b/cloud/kubernetes/v1.7/client-secure.yaml
@@ -31,7 +31,7 @@ spec:
       mountPath: /cockroach-certs
   containers:
   - name: cockroachdb-client
-    image: cockroachdb/cockroach:v21.1.5
+    image: cockroachdb/cockroach:v21.1.6
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - name: client-certs

diff --git a/cloud/kubernetes/v1.7/cluster-init-secure.yaml b/cloud/kubernetes/v1.7/cluster-init-secure.yaml
@@ -33,7 +33,7 @@ spec:
           mountPath: /cockroach-certs
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         volumeMounts:
         - name: client-certs

diff --git a/cloud/kubernetes/v1.7/cluster-init.yaml b/cloud/kubernetes/v1.7/cluster-init.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: cluster-init
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         command:
           - "/cockroach/cockroach"

diff --git a/cloud/kubernetes/v1.7/cockroachdb-statefulset-secure.yaml b/cloud/kubernetes/v1.7/cockroachdb-statefulset-secure.yaml
@@ -189,7 +189,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/cloud/kubernetes/v1.7/cockroachdb-statefulset.yaml b/cloud/kubernetes/v1.7/cockroachdb-statefulset.yaml
@@ -92,7 +92,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
       - name: cockroachdb
-        image: cockroachdb/cockroach:v21.1.5
+        image: cockroachdb/cockroach:v21.1.6
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 26257

diff --git a/go.mod b/go.mod
@@ -42,7 +42,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.13.0
 	github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f
-	github.com/cockroachdb/pebble v0.0.0-20210712141052-2215b8d4c8ab
+	github.com/cockroachdb/pebble v0.0.0-20210719141320-8c3bd06debb5
 	github.com/cockroachdb/redact v1.1.3
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2

diff --git a/go.sum b/go.sum
@@ -263,8 +263,8 @@ github.com/cockroachdb/gostdlib v1.13.0 h1:TzSEPYgkKDNei3gbLc0rrHu4iHyBp7/+NxPOF
 github.com/cockroachdb/gostdlib v1.13.0/go.mod h1:eXX95p9QDrYwJfJ6AgeN9QnRa/lqqid9LAzWz/l5OgA=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
 github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
-github.com/cockroachdb/pebble v0.0.0-20210712141052-2215b8d4c8ab h1:5qIOzg4DH0pJqNFV5KyqtfIJalHGorKbsMQlog8sO1g=
-github.com/cockroachdb/pebble v0.0.0-20210712141052-2215b8d4c8ab/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs=
+github.com/cockroachdb/pebble v0.0.0-20210719141320-8c3bd06debb5 h1:Igd6YmtOZ77EgLAIaE9+mHl7+sAKaZ5m4iMI0Dz/J2A=
+github.com/cockroachdb/pebble v0.0.0-20210719141320-8c3bd06debb5/go.mod h1:JXfQr3d+XO4bL1pxGwKKo09xylQSdZ/mpZ9b2wfVcPs=
 github.com/cockroachdb/pq v0.0.0-20210517091544-990dd3347596 h1:xTc0ViFhuelzQZAYQOxMR2J5QDO9/C+0L0fkPXIcoMI=
 github.com/cockroachdb/pq v0.0.0-20210517091544-990dd3347596/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row b/pkg/ccl/logictestccl/testdata/logic_test/regional_by_row
@@ -1652,6 +1652,9 @@ ALTER TABLE regional_by_row_table ADD CONSTRAINT unique_b_a UNIQUE(b, a)
 
 # We should plan uniqueness checks for all unique indexes in
 # REGIONAL BY ROW tables.
+# TODO(treilly): The constraint check for uniq_idx should use uniq_idx but due
+# to stats issues w/ empty stats, partial indexes and multicol stats its not.
+# Hopefully fixing #67583 (and possibly #67479) will resolve this.
 query T
 SELECT * FROM [EXPLAIN INSERT INTO regional_by_row_table (pk, pk2, a, b) VALUES (1, 1, 1, 1)] OFFSET 2
 ----
@@ -1698,9 +1701,9 @@ SELECT * FROM [EXPLAIN INSERT INTO regional_by_row_table (pk, pk2, a, b) VALUES
 │   └── • error if rows
 │       │
 │       └── • lookup join (semi)
-│           │ table: regional_by_row_table@uniq_idx (partial index)
-│           │ lookup condition: (column3 = a) AND (crdb_region = 'ap-southeast-2')
-│           │ remote lookup condition: (column3 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))
+│           │ table: regional_by_row_table@new_idx
+│           │ lookup condition: ((column3 = a) AND (crdb_region = 'ap-southeast-2')) AND (b > 0)
+│           │ remote lookup condition: ((column3 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))) AND (b > 0)
 │           │ pred: (column1 != pk) OR (crdb_region_default != crdb_region)
 │           │
 │           └── • filter
@@ -1728,6 +1731,9 @@ INSERT INTO regional_by_row_table (crdb_region, pk, pk2, a, b) VALUES ('us-east-
 
 # The conflict columns in an upsert should only include the primary key,
 # not the region column.
+# TODO(treilly): The constraint check for uniq_idx should use uniq_idx but due
+# to stats issues w/ empty stats, partial indexes and multicol stats its not.
+# Hopefully fixing #67583 (and possibly #67479) will resolve this.
 query T
 SELECT * FROM [EXPLAIN UPSERT INTO regional_by_row_table (crdb_region, pk, pk2, a, b) VALUES ('us-east-1', 2, 3, 2, 3)] OFFSET 2
 ----
@@ -1779,9 +1785,9 @@ SELECT * FROM [EXPLAIN UPSERT INTO regional_by_row_table (crdb_region, pk, pk2,
 │   └── • error if rows
 │       │
 │       └── • lookup join (semi)
-│           │ table: regional_by_row_table@uniq_idx (partial index)
-│           │ lookup condition: (column4 = a) AND (crdb_region = 'ap-southeast-2')
-│           │ remote lookup condition: (column4 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))
+│           │ table: regional_by_row_table@new_idx
+│           │ lookup condition: ((column4 = a) AND (crdb_region = 'ap-southeast-2')) AND (b > 0)
+│           │ remote lookup condition: ((column4 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))) AND (b > 0)
 │           │ pred: (upsert_pk != pk) OR (column1 != crdb_region)
 │           │
 │           └── • filter
@@ -1803,6 +1809,9 @@ SELECT * FROM [EXPLAIN UPSERT INTO regional_by_row_table (crdb_region, pk, pk2,
             └── • scan buffer
                   label: buffer 1
 
+# TODO(treilly): The constraint check for uniq_idx should use uniq_idx but due
+# to stats issues w/ empty stats, partial indexes and multicol stats its not.
+# Hopefully fixing #67583 (and possibly #67479) will resolve this.
 query T
 SELECT * FROM [EXPLAIN UPSERT INTO regional_by_row_table (crdb_region, pk, pk2, a, b)
 VALUES ('us-east-1', 23, 24, 25, 26), ('ca-central-1', 30, 30, 31, 32)] OFFSET 2
@@ -1850,9 +1859,9 @@ VALUES ('us-east-1', 23, 24, 25, 26), ('ca-central-1', 30, 30, 31, 32)] OFFSET 2
 │   └── • error if rows
 │       │
 │       └── • lookup join (semi)
-│           │ table: regional_by_row_table@uniq_idx (partial index)
-│           │ lookup condition: (column4 = a) AND (crdb_region = 'ap-southeast-2')
-│           │ remote lookup condition: (column4 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))
+│           │ table: regional_by_row_table@new_idx
+│           │ lookup condition: ((column4 = a) AND (crdb_region = 'ap-southeast-2')) AND (b > 0)
+│           │ remote lookup condition: ((column4 = a) AND (crdb_region IN ('ca-central-1', 'us-east-1'))) AND (b > 0)
 │           │ pred: (upsert_pk != pk) OR (column1 != crdb_region)
 │           │
 │           └── • filter

diff --git a/pkg/cmd/roachtest/tests/predecessor_version.go b/pkg/cmd/roachtest/tests/predecessor_version.go
@@ -34,7 +34,7 @@ func PredecessorVersion(buildVersion version.Version) (string, error) {
 	// (see runVersionUpgrade). The same is true for adding a new key to this
 	// map.
 	verMap := map[string]string{
-		"21.2": "21.1.5",
+		"21.2": "21.1.6",
 		"21.1": "20.2.12",
 		"20.2": "20.1.16",
 		"20.1": "19.2.11",

diff --git a/pkg/roachpb/data.go b/pkg/roachpb/data.go
@@ -2244,6 +2244,18 @@ func (s Span) ContainsKey(key Key) bool {
 	return bytes.Compare(key, s.Key) >= 0 && bytes.Compare(key, s.EndKey) < 0
 }
 
+// CompareKey returns -1 if the key precedes the span start, 0 if its contained
+// by the span and 1 if its after the end of the span.
+func (s Span) CompareKey(key Key) int {
+	if bytes.Compare(key, s.Key) >= 0 {
+		if bytes.Compare(key, s.EndKey) < 0 {
+			return 0
+		}
+		return 1
+	}
+	return -1
+}
+
 // ProperlyContainsKey returns whether the span properly contains the given key.
 func (s Span) ProperlyContainsKey(key Key) bool {
 	return bytes.Compare(key, s.Key) > 0 && bytes.Compare(key, s.EndKey) < 0