Fixed invalid UTF-8 by sending data as Scaled Count 2

Author: tvincentNuoDB

pynuodb/encodedsession.py

@@ -43,6 +43,7 @@ class EncodedSession(Session):
     putScaledTime -- Appends a Scaled Time value to the message.
     putScaledTimestamp -- Appends a Scaled Timestamp value to the message.    
     putScaledDate -- Appends a Scaled Date value to the message.
+    putScaledCount2 -- Appends a scaled and signed decimal to the message
     putValue -- Determines the probable type of the value and calls the supporting function.
     getInt -- Read the next Integer value off the session.
     getScaledInt -- Read the next Scaled Integer value off the session.
@@ -396,6 +397,11 @@ def putScaledInt(self, value):
         value += 0
         scale = abs(value.as_tuple()[2])
         valueStr = toSignedByteString(int(value * decimal.Decimal(10**scale)))
+        
+        #If our length is more than 9 bytes we will need to send the data using ScaledCount2
+        if len(valueStr) > 9:
+            return self.putScaledCount2(value)
+
         packed = chr(protocol.SCALEDLEN0 + len(valueStr)) + chr(scale) + valueStr
         self.__output += packed
         return self
@@ -531,6 +537,15 @@ def putScaledDate(self, value):
         self.__output += packed
         return self
 
+    def putScaledCount2(self, value):
+        """ Appends a scaled and signed decimal to the message """
+        scale = abs(value.as_tuple()[2])
+        sign = "1" if value.as_tuple()[0] == 0 else "-1"
+        value = toSignedByteString(int(value * decimal.Decimal(10**scale)))
+        packed = chr(protocol.SCALEDCOUNT2) + chr(scale) + sign + chr(len(value)) + value
+        self.__output += packed
+        return self
+
     def putValue(self, value):
         """Determines the probable type of the value and calls the supporting function."""
         if value is None:

tests/nuodb_basic_test.py

@@ -153,7 +153,6 @@ def _test_decimal_fixture(self, value, precision, scale):
     #
     #   py.test -k "test_many_significant_digits"
     #
-    @unittest.skip("produces invalid UTF-8 code sequence")
     def test_many_significant_digits(self):
         self._test_decimal_fixture(decimal.Decimal("31943874831932418390.01"), 38, 12)