opt: fix inverted key column type in testcat

Previously, inverted key columns in the test catalog were incorrectly given the type of their source column. Now they have the correct type, `types.EncodedKey`. Release note: None
cockroachdb · Jun 8, 2022 · ec8e63c · ec8e63c
1 parent ba4d29e
commit ec8e63c
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 84 deletions.
diff --git a/pkg/sql/catalog/tabledesc/index.go b/pkg/sql/catalog/tabledesc/index.go
@@ -170,7 +170,7 @@ func (w index) InvertedColumnName() string {
 }
 
 // InvertedColumnKeyType returns the type of the data element that is encoded
-// as the inverted index key. This is currently always Bytes.
+// as the inverted index key. This is currently always EncodedKey.
 //
 // Panics if the index is not inverted.
 func (w index) InvertedColumnKeyType() *types.T {

diff --git a/pkg/sql/opt/memo/testdata/stats/inverted-array b/pkg/sql/opt/memo/testdata/stats/inverted-array
@@ -72,7 +72,7 @@ index-join t
       ├── stats: [rows=1020]
       ├── key: (1)
       └── scan t@a_idx
-           ├── columns: k:1(int!null) a_inverted_key:5(int[]!null)
+           ├── columns: k:1(int!null) a_inverted_key:5(encodedkey!null)
            ├── inverted constraint: /5/1
            │    └── spans: ["", ""]
            ├── flags: force-index=a_idx
@@ -120,7 +120,7 @@ index-join t
       ├── stats: [rows=20]
       ├── key: (1)
       └── scan t@a_idx
-           ├── columns: k:1(int!null) a_inverted_key:5(int[]!null)
+           ├── columns: k:1(int!null) a_inverted_key:5(encodedkey!null)
            ├── inverted constraint: /5/1
            │    └── spans: ["\x8a", "\x8c")
            ├── stats: [rows=20, distinct(1)=19.6078, null(1)=0, avgsize(1)=4, distinct(5)=2, null(5)=0, avgsize(5)=4]
@@ -183,7 +183,7 @@ select
  │         ├── stats: [rows=20]
  │         ├── key: (1)
  │         └── scan t@a_idx
- │              ├── columns: k:1(int!null) a_inverted_key:5(int[]!null)
+ │              ├── columns: k:1(int!null) a_inverted_key:5(encodedkey!null)
  │              ├── inverted constraint: /5/1
  │              │    └── spans
  │              │         ├── ["C", "C"]
@@ -222,7 +222,7 @@ select
  │         ├── stats: [rows=30]
  │         ├── key: (1)
  │         └── scan t@a_idx
- │              ├── columns: k:1(int!null) a_inverted_key:5(int[]!null)
+ │              ├── columns: k:1(int!null) a_inverted_key:5(encodedkey!null)
  │              ├── inverted constraint: /5/1
  │              │    └── spans
  │              │         ├── ["C", "C"]
@@ -267,7 +267,7 @@ select
  │         ├── stats: [rows=30]
  │         ├── key: (1)
  │         └── scan t@a_idx
- │              ├── columns: k:1(int!null) a_inverted_key:5(int[]!null)
+ │              ├── columns: k:1(int!null) a_inverted_key:5(encodedkey!null)
  │              ├── inverted constraint: /5/1
  │              │    └── spans
  │              │         ├── ["C", "C"]

diff --git a/pkg/sql/opt/memo/testdata/stats/inverted-geo b/pkg/sql/opt/memo/testdata/stats/inverted-geo
@@ -181,7 +181,7 @@ project
       │    │              ├── stats: [rows=1.4e-06]
       │    │              ├── key: (3)
       │    │              └── scan t@t_g_idx
-      │    │                   ├── columns: rowid:3(int!null) g_inverted_key:6(geometry!null)
+      │    │                   ├── columns: rowid:3(int!null) g_inverted_key:6(encodedkey!null)
       │    │                   ├── inverted constraint: /6/3
       │    │                   │    └── spans: ["B\xfd\xff\xff\xff\xff\xff\xff\xff\xff", "B\xfd\xff\xff\xff\xff\xff\xff\xff\xff"]
       │    │                   ├── stats: [rows=1.4e-06, distinct(3)=4e-07, null(3)=0, avgsize(3)=4, distinct(6)=1.4e-06, null(6)=0, avgsize(6)=4]
@@ -401,7 +401,7 @@ project
       │    │              ├── stats: [rows=1.42e-06]
       │    │              ├── key: (3)
       │    │              └── scan t@t_g_idx
-      │    │                   ├── columns: rowid:3(int!null) g_inverted_key:6(geometry!null)
+      │    │                   ├── columns: rowid:3(int!null) g_inverted_key:6(encodedkey!null)
       │    │                   ├── inverted constraint: /6/3
       │    │                   │    └── spans: ["B\xfd\xff\xff\xff\xff\xff\xff\xff\xff", "B\xfd\xff\xff\xff\xff\xff\xff\xff\xff"]
       │    │                   ├── stats: [rows=1.42e-06, distinct(3)=4e-07, null(3)=0, avgsize(3)=4, distinct(6)=1.42e-06, null(6)=0, avgsize(6)=4]
@@ -480,7 +480,7 @@ select
  │         ├── stats: [rows=100]
  │         ├── key: (3)
  │         └── scan t@t_g_idx
- │              ├── columns: rowid:3(int!null) g_inverted_key:6(geometry!null)
+ │              ├── columns: rowid:3(int!null) g_inverted_key:6(encodedkey!null)
  │              ├── inverted constraint: /6/3
  │              │    └── spans
  │              │         ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
@@ -522,7 +522,7 @@ project
       │         ├── stats: [rows=100]
       │         ├── key: (3)
       │         └── scan t@t_g_idx
-      │              ├── columns: rowid:3(int!null) g_inverted_key:6(geometry!null)
+      │              ├── columns: rowid:3(int!null) g_inverted_key:6(encodedkey!null)
       │              ├── inverted constraint: /6/3
       │              │    └── spans
       │              │         ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]

diff --git a/pkg/sql/opt/memo/testdata/stats/inverted-geo-multi-column b/pkg/sql/opt/memo/testdata/stats/inverted-geo-multi-column
@@ -99,7 +99,7 @@ project
       │         ├── stats: [rows=60.78475]
       │         ├── key: (1)
       │         └── scan t@m
-      │              ├── columns: k:1(int!null) g_inverted_key:7(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:7(encodedkey!null)
       │              ├── constraint: /3: [/'banana' - /'banana']
       │              ├── inverted constraint: /7/1
       │              │    └── spans
@@ -151,7 +151,7 @@ project
       │         ├── stats: [rows=60.78475]
       │         ├── key: (1)
       │         └── scan t@p,partial
-      │              ├── columns: k:1(int!null) g_inverted_key:8(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:8(encodedkey!null)
       │              ├── inverted constraint: /8/1
       │              │    └── spans
       │              │         ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
@@ -214,7 +214,7 @@ project
       │         ├── stats: [rows=121.5695]
       │         ├── key: (1)
       │         └── scan t@m
-      │              ├── columns: k:1(int!null) g_inverted_key:7(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:7(encodedkey!null)
       │              ├── constraint: /3
       │              │    ├── [/'apple' - /'apple']
       │              │    ├── [/'banana' - /'banana']
@@ -269,7 +269,7 @@ project
       │         ├── stats: [rows=121.5695]
       │         ├── key: (1)
       │         └── scan t@p,partial
-      │              ├── columns: k:1(int!null) g_inverted_key:9(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:9(encodedkey!null)
       │              ├── inverted constraint: /9/1
       │              │    └── spans
       │              │         ├── ["B\xfd\x10\x00\x00\x00\x00\x00\x00\x00", "B\xfd\x10\x00\x00\x00\x00\x00\x00\x00"]
@@ -332,7 +332,7 @@ project
       │         ├── stats: [rows=5.512417]
       │         ├── key: (1)
       │         └── scan t@mp,partial
-      │              ├── columns: k:1(int!null) g_inverted_key:10(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:10(encodedkey!null)
       │              ├── constraint: /4: [/400 - /400]
       │              ├── inverted constraint: /10/1
       │              │    └── spans
@@ -388,7 +388,7 @@ project
       │         ├── stats: [rows=14.82863]
       │         ├── key: (1)
       │         └── scan t@mp,partial
-      │              ├── columns: k:1(int!null) g_inverted_key:10(geometry!null)
+      │              ├── columns: k:1(int!null) g_inverted_key:10(encodedkey!null)
       │              ├── constraint: /4
       │              │    ├── [/200 - /200]
       │              │    ├── [/300 - /300]