Fixed: Ref: db.command hanging with 100% CPU #2 #68

Support for protocol 29

Update Travis.ci

.travis.yml

@@ -14,15 +14,22 @@ after_success:
   - coveralls
 
 env:
+  - ORIENTDB_VERSION=2.0.8
+  - ORIENTDB_VERSION=2.0.7
+  - ORIENTDB_VERSION=2.0.6
+  - ORIENTDB_VERSION=2.0.5
   - ORIENTDB_VERSION=2.0.4
   - ORIENTDB_VERSION=2.0.3
   - ORIENTDB_VERSION=2.0.2
   - ORIENTDB_VERSION=2.0.1
-  - ORIENTDB_VERSION=2.0
   - ORIENTDB_VERSION=1.7.10
+  - ORIENTDB_VERSION=1.7.8
   - ORIENTDB_VERSION=1.7.7
   - ORIENTDB_VERSION=1.7.4
 
 matrix:
   allow_failures:
-#    - env: ORIENTDB_VERSION=1.7.7
+    - ORIENTDB_VERSION=1.7.10
+    - ORIENTDB_VERSION=1.7.8
+    - ORIENTDB_VERSION=1.7.7
+    - ORIENTDB_VERSION=1.7.4

pyorient/constants.py

@@ -4,8 +4,8 @@
 # Driver Constants
 #
 NAME = "OrientDB Python binary client (pyorient)"
-VERSION = "1.4"
-SUPPORTED_PROTOCOL = 28
+VERSION = "1.4.1"
+SUPPORTED_PROTOCOL = 29
 
 #
 # Binary Types

pyorient/messages/base.py

@@ -269,14 +269,14 @@ def _encode_field(field):
         elif t['type'] == BYTES:
             _content = struct.pack("!i", len(v)) + v
         elif t['type'] == STRING:
-            if sys.version_info.major >= 3:
+            if sys.version_info[0] >= 3:
                 if isinstance( v, str ):
                     v = v.encode('utf-8')
             _content = struct.pack("!i", len(v)) + v
         elif t['type'] == STRINGS:
             _content = b''
             for s in v:
-                if sys.version_info.major >= 3:
+                if sys.version_info[0] >= 3:
                     if isinstance( s, str ):
                         s = s.encode('utf-8')
                 _content += struct.pack("!i", len(s)) + s

pyorient/messages/commands.py

@@ -179,6 +179,9 @@ def _read_sync(self):
             response_type = response_type.decode()
         res = []
         if response_type == 'n':
+            self._append( FIELD_CHAR )
+            super( CommandMessage, self ).fetch_response(True)
+            # end Line \x00
             return None
         elif response_type == 'r':
             res = [ self._read_record() ]

setup.py

@@ -19,7 +19,7 @@
 from setuptools import setup
 
 setup(name='pyorient',
-    version='1.4',
+    version='1.4.1',
     author='Niko Usai <mogui83@gmail.com>, Domenico Lupinetti <ostico@gmail.com>',
     description='OrientDB native client library',
     long_description=open('README.md').read(),

test/test_new_Iface.py

@@ -237,6 +237,39 @@ def test_use_of_dir(self):
         client.connect("root", "root")
         dir(client)
 
+    def test_alter_statement(self):
+        client = pyorient.OrientDB("localhost", 2424)
+        client.connect("root", "root")
+
+        db_name = "test_1234_db"
+        try:
+            client.db_drop(db_name)
+        except pyorient.PyOrientCommandException as e:
+            print(e)
+        finally:
+            db = client.db_create(db_name, pyorient.DB_TYPE_GRAPH,
+                                  pyorient.STORAGE_TYPE_MEMORY)
+
+        cluster_info = client.db_open(
+            db_name, "admin", "admin", pyorient.DB_TYPE_GRAPH, ""
+        )
+
+        client.command( "create class obj" )
+        client.command( "create property obj._KEY string" )
+        client.command( "alter property obj._KEY mandatory true" )
+        with self.assertRaises( pyorient.PyOrientCommandException ) as context:
+            client.command( "create index KEY on obj _KEY unique" )
+
+        import re
+        match_obj = re.match( r'(.*):.*',
+                             str( context.exception ) )
+
+        self.assertTrue( 'Error on parsing command at position #23'
+                         in match_obj.group(1) )
+
+        client.command( "create index KEY on obj ( _KEY ) unique" )
+        assert True is True
+
 
 # x = CommandTestCase('test_command').run()