Renamed unpack_row() -> unpack_plain_row(), unpack_ce_row() -> unpack_col_encrypted_row()

Per review comments.

Signed-off-by: Yaniv Kaul <yaniv.kaul@scylladb.com>

Author: mykaul

cassandra/numpy_parser.pyx

@@ -97,7 +97,7 @@ cdef _parse_rows(BytesIOReader reader, ParseDesc desc,
     cdef Py_ssize_t i
 
     for i in range(rowcount):
-        unpack_row(reader, desc, arrs)
+        unpack_plain_row(reader, desc, arrs)
 
 
 ### Helper functions to create NumPy arrays and array descriptors
@@ -144,7 +144,7 @@ def make_array(coltype, array_size):
 
 @cython.boundscheck(False)
 @cython.wraparound(False)
-cdef inline int unpack_row(
+cdef inline int unpack_plain_row(
         BytesIOReader reader, ParseDesc desc, ArrDesc *arrays) except -1:
     cdef Buffer buf
     cdef Py_ssize_t i, rowsize = desc.rowsize

cassandra/obj_parser.pyx

@@ -32,9 +32,9 @@ cdef class ListParser(ColumnParser):
         rowcount = read_int(reader)
         cdef RowParser rowparser = TupleRowParser()
         if desc.column_encryption_policy:
-            return [rowparser.unpack_ce_row(reader, desc) for i in range(rowcount)]
+            return [rowparser.unpack_col_encrypted_row(reader, desc) for i in range(rowcount)]
         else:
-            return [rowparser.unpack_row(reader, desc) for i in range(rowcount)]
+            return [rowparser.unpack_plain_row(reader, desc) for i in range(rowcount)]
 
 
 cdef class LazyParser(ColumnParser):
@@ -51,21 +51,21 @@ def parse_rows_lazy(BytesIOReader reader, ParseDesc desc):
     rowcount = read_int(reader)
     cdef RowParser rowparser = TupleRowParser()
     if desc.column_encryption_policy:
-        return (rowparser.unpack_ce_row(reader, desc) for i in range(rowcount))
+        return (rowparser.unpack_col_encrypted_row(reader, desc) for i in range(rowcount))
     else:
-        return (rowparser.unpack_row(reader, desc) for i in range(rowcount))
+        return (rowparser.unpack_plain_row(reader, desc) for i in range(rowcount))
 
 
 cdef class TupleRowParser(RowParser):
     """
     Parse a single returned row into a tuple of objects:
 
         (obj1, ..., objN)
-    If CE (Column encryption) policy is enabled - use unpack_ce_row(),
-    otherwsise use unpack_row()
+    If CE (Column encryption) policy is enabled - use unpack_col_encrypted_row(),
+    otherwsise use unpack_plain_row()
     """
 
-    cpdef unpack_ce_row(self, BytesIOReader reader, ParseDesc desc):
+    cpdef unpack_col_encrypted_row(self, BytesIOReader reader, ParseDesc desc):
         assert desc.rowsize >= 0
 
         cdef Buffer buf
@@ -101,7 +101,7 @@ cdef class TupleRowParser(RowParser):
 
         return res
 
-    cpdef unpack_row(self, BytesIOReader reader, ParseDesc desc):
+    cpdef unpack_plain_row(self, BytesIOReader reader, ParseDesc desc):
         assert desc.rowsize >= 0
 
         cdef Buffer buf

cassandra/parsing.pxd

@@ -28,5 +28,5 @@ cdef class ColumnParser:
     cpdef parse_rows(self, BytesIOReader reader, ParseDesc desc)
 
 cdef class RowParser:
-    cpdef unpack_row(self, BytesIOReader reader, ParseDesc desc)
+    cpdef unpack_plain_row(self, BytesIOReader reader, ParseDesc desc)
 

cassandra/parsing.pyx

@@ -39,7 +39,7 @@ cdef class ColumnParser:
 cdef class RowParser:
     """Parser for a single row"""
 
-    cpdef unpack_row(self, BytesIOReader reader, ParseDesc desc):
+    cpdef unpack_plain_row(self, BytesIOReader reader, ParseDesc desc):
         """
         Unpack a single row of data in a ResultMessage.
         """

cassandra/row_parser.pyx

@@ -46,9 +46,9 @@ def make_recv_results_rows(ColumnParser colparser):
             rowcount = read_int(reader)
             if desc.column_encryption_policy:
                 for i in range(rowcount):
-                    rowparser.unpack_ce_row(reader, desc)
+                    rowparser.unpack_col_encrypted_row(reader, desc)
             else:
                 for i in range(rowcount):
-                    rowparser.unpack_row(reader, desc)
+                    rowparser.unpack_plain_row(reader, desc)
 
     return recv_results_rows