From 64f56b7531858038c1dd31719deae1bfe7ea0d8c Mon Sep 17 00:00:00 2001
From: Nathan VanBenschoten <nvanbenschoten@gmail.com>
Date: Tue, 28 Apr 2020 19:41:54 -0400
Subject: [PATCH] storage: remove use of TODOSQLCodec in RowCounter.Count

---
 pkg/storage/row_counter.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/storage/row_counter.go b/pkg/storage/row_counter.go
index e56024aeb7d2..814c337a6259 100644
--- a/pkg/storage/row_counter.go
+++ b/pkg/storage/row_counter.go
@@ -51,7 +51,11 @@ func (r *RowCounter) Count(key roachpb.Key) error {
 
 	r.prev = append(r.prev[:0], row...)
 
-	_, tableID, indexID, err := keys.TODOSQLCodec.DecodeIndexPrefix(row)
+	rem, _, err := keys.DecodeTenantPrefix(row)
+	if err != nil {
+		return err
+	}
+	_, tableID, indexID, err := keys.DecodeTableIDIndexID(rem)
 	if err != nil {
 		return err
 	}