PR comments fixed

Author: DvirDukhan

src/graph.js

@@ -16,14 +16,14 @@ class Graph {
 	 * @param options node_redis options
 	 */
 	constructor(graphId, host, port, options) {
-		this._graphId = graphId;		// Graph ID
-		this._labels = [];            	// List of node labels.
-		this._relationshipTypes = []; 	// List of relation types.
-		this._properties = [];        	// List of properties.
-
-		this._labelsPromise = undefined;
-		this._propertyPromise = undefined;
-		this._relationshipPromise = undefined;
+		this._graphId = graphId;				// Graph ID
+		this._labels = [];            			// List of node labels.
+		this._relationshipTypes = []; 			// List of relation types.
+		this._properties = [];        			// List of properties.
+
+		this._labelsPromise = undefined;		// used as a synchronization mechanizom for labels retrival
+		this._propertyPromise = undefined;		// used as a synchronization mechanizom for property names retrival
+		this._relationshipPromise = undefined;	// used as a synchronization mechanizom for relationship types retrival
 
 		let client =
 			host instanceof redis.RedisClient

src/resultSet.js

@@ -114,8 +114,13 @@ class ResultSet {
             let prop = props[i];
             var propIndex = prop[0];
             let prop_name = this._graph.getProperty(propIndex);
-            while (prop_name == undefined) {
+            var x = 0;
+            while (prop_name == undefined && x <10) {
                 prop_name = await this._graph.fetchAndGetProperty(propIndex);
+                x++;
+            }
+            if (prop_name == undefined) {
+                console.log("unable to retrive property name value for propety index " + propIndex);
             }
             let prop_value = this.parseScalar(prop.slice(1, prop.length));
             properties[prop_name] = prop_value;
@@ -130,8 +135,13 @@ class ResultSet {
 
         let node_id = cell[0];
         let label = this._graph.getLabel(cell[1][0]);
-        while (label == undefined) {
+        var x = 0;
+        while (label == undefined && x < 10) {
             label = await this._graph.fetchAndGetLabel(cell[1][0]);
+            x++;
+        }
+        if (label == undefined) {
+            console.log("unable to retrive label value for label index " + cell[1][0]);
         }
         let properties = await this.parseEntityProperties(cell[2]);
         let node = new Node(label, properties);
@@ -148,8 +158,13 @@ class ResultSet {
 
         let edge_id = cell[0];
         let relation = this._graph.getRelationship(cell[1]);
-        while (relation == undefined) {
+        var x = 0;
+        while (relation == undefined && x < 10) {
             relation = await this._graph.fetchAndGetRelationship(cell[1])
+            x++;
+        }
+        if (relation == undefined) {
+            console.log("unable to retrive relationship type value for relationship index " + cell[1]);
         }
         let src_node_id = cell[2];
         let dest_node_id = cell[3];

test/redisGraphAPITest.js

@@ -176,7 +176,7 @@ describe('RedisGraphAPI Test', () => {
 					assert.equal("roi", n.properties['name']);
 					assert.equal("person", n.label);
 					assert.equal(0, n.id);
-					console.log("ok")
+					console.info("ok")
 				}
 			});
 		})