From fd87e8d2f3bf4ee02517894436819a6dab32e17e Mon Sep 17 00:00:00 2001
From: Jason Aten <jason.aten@molecula.com>
Date: Sun, 4 Oct 2020 16:17:54 -0500
Subject: [PATCH 1/2] follow suggestion on
 https://github.com/molecula/idk/issues/224, does it fix Q2 delete consumer
 issue?  - apparently not, but this might still be worth doing.

---
 server/grpc.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server/grpc.go b/server/grpc.go
index f378fd403..7d12073ca 100644
--- a/server/grpc.go
+++ b/server/grpc.go
@@ -882,6 +882,8 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 					return nil
 				}
 				cols = limitedCols
+			} else {
+				return errors.Errorf("expected 1 result for inspect query; got %d from %q", len(resp.Results), req.Query)
 			}
 		}
 
@@ -924,6 +926,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 								&pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Uint64ArrayVal{Uint64ArrayVal: &pb.Uint64Array{Vals: ids.Rows}}})
 							colAdded++
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "mutex":
@@ -955,6 +960,10 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "int":
@@ -1028,6 +1037,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 								rowResp.Columns = append(rowResp.Columns,
 									&pb.ColumnResponse{ColumnVal: nil})
 							}
+						} else {
+							rowResp.Columns = append(rowResp.Columns,
+								&pb.ColumnResponse{ColumnVal: nil})
 						}
 					}
 
@@ -1052,6 +1064,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "bool":
@@ -1083,6 +1098,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
+					} else {
+						rowResp.Columns = append(rowResp.Columns,
+							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
 				case "time":

From 5e2a14400a3cba60aef395a18dbeb400339377b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:08:59 +0200
Subject: [PATCH 2/2] Add an extra else branches

---
 server/grpc.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/grpc.go b/server/grpc.go
index 7d12073ca..47dcf6a07 100644
--- a/server/grpc.go
+++ b/server/grpc.go
@@ -925,6 +925,9 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: &pb.ColumnResponse_Uint64ArrayVal{Uint64ArrayVal: &pb.Uint64Array{Vals: ids.Rows}}})
 							colAdded++
+						} else {
+							rowResp.Columns = append(rowResp.Columns,
+								&pb.ColumnResponse{ColumnVal: nil})
 						}
 					} else {
 						rowResp.Columns = append(rowResp.Columns,
@@ -960,7 +963,6 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							rowResp.Columns = append(rowResp.Columns,
 								&pb.ColumnResponse{ColumnVal: nil})
 						}
-
 					} else {
 						rowResp.Columns = append(rowResp.Columns,
 							&pb.ColumnResponse{ColumnVal: nil})
@@ -1000,7 +1002,13 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 										value = vals[0]
 										exists = true
 									}
+								} else {
+									rowResp.Columns = append(rowResp.Columns,
+										&pb.ColumnResponse{ColumnVal: nil})
 								}
+							} else {
+								rowResp.Columns = append(rowResp.Columns,
+									&pb.ColumnResponse{ColumnVal: nil})
 							}
 						} else {
 							value, exists, err = field.StringValue(tx, id)
@@ -1103,7 +1111,7 @@ func (h *GRPCHandler) Inspect(req *pb.InspectRequest, stream pb.Pilosa_InspectSe
 							&pb.ColumnResponse{ColumnVal: nil})
 					}
 
-				case "time":
+				default:
 					rowResp.Columns = append(rowResp.Columns,
 						&pb.ColumnResponse{ColumnVal: nil})
 				}