Properly set qualifier when encountering new cell.

garye · dhermes · commit ff576b6f998f · 2017-11-02T11:29:45.000-07:00
diff --git a/bigtable/google/cloud/bigtable/row_data.py b/bigtable/google/cloud/bigtable/row_data.py
@@ -283,10 +283,14 @@ def consume_next(self):
                 row = self._row = PartialRowData(chunk.row_key)
 
             if cell is None:
+                qualifier = None
+                if chunk.HasField('qualifier'):
+                    qualifier = chunk.qualifier.value
+
                 cell = self._cell = PartialCellData(
                     chunk.row_key,
                     chunk.family_name.value,
-                    chunk.qualifier.value,
+                    qualifier,
                     chunk.timestamp_micros,
                     chunk.labels,
                     chunk.value)
diff --git a/bigtable/tests/unit/read-rows-acceptance-test.json b/bigtable/tests/unit/read-rows-acceptance-test.json
@@ -1178,7 +1178,7 @@
       "name": "empty second qualifier",
       "chunks": [
         "row_key: \"RK\"\nfamily_name: \u003c\n  value: \"A\"\n\u003e\nqualifier: \u003c\n  value: \"C\"\n\u003e\ntimestamp_micros: 99\nvalue: \"value-VAL_1\"\ncommit_row: false\n",
-	"qualifier: \u003c\n  value: \"C\"\n\u003e\ntimestamp_micros: 98\nvalue: \"value-VAL_2\"\ncommit_row: true\n"
+        "qualifier: \u003c\n  value: \"\"\n\u003e\ntimestamp_micros: 98\nvalue: \"value-VAL_2\"\ncommit_row: true\n"
       ],
       "results": [
         {

Original file line number	Diff line number	Diff line change
`@@ -1178,7 +1178,7 @@`
`1178`	`1178`	`"name": "empty second qualifier",`
`1179`	`1179`	`"chunks": [`
`1180`	`1180`	`"row_key: \"RK\"\nfamily_name: \u003c\n value: \"A\"\n\u003e\nqualifier: \u003c\n value: \"C\"\n\u003e\ntimestamp_micros: 99\nvalue: \"value-VAL_1\"\ncommit_row: false\n",`
`1181`		`- "qualifier: \u003c\n value: \"C\"\n\u003e\ntimestamp_micros: 98\nvalue: \"value-VAL_2\"\ncommit_row: true\n"`
	`1181`	`+ "qualifier: \u003c\n value: \"\"\n\u003e\ntimestamp_micros: 98\nvalue: \"value-VAL_2\"\ncommit_row: true\n"`
`1182`	`1182`	`],`
`1183`	`1183`	`"results": [`
`1184`	`1184`	`{`