Fixed memory issues with Vpack in order to get rewind() to work properly

martin-schilling · martin-schilling · commit 32eace4672cb · 2017-11-24T19:46:12.000+01:00
diff --git a/src/cursor.cpp b/src/cursor.cpp
@@ -2,9 +2,9 @@
 
 namespace arangodb { namespace fuerte { namespace php {
 
-    Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(vpack), connection(connection)
+    Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(*vpack), connection(connection)
     {
-        this->loadFirstBatch();
+        this->rewind();
     }
 
     void Cursor::setOption(int option, int value)
@@ -18,7 +18,7 @@ namespace arangodb { namespace fuerte { namespace php {
 
     void Cursor::loadFirstBatch()
     {
-        Request request("/_api/cursor", this->vpack);
+        Request request("/_api/cursor", &this->vpack);
         request.setHttpMethod(Request::METHOD_POST);
 
         Response* response = this->connection->sendRequest(&request);
@@ -115,6 +115,8 @@ namespace arangodb { namespace fuerte { namespace php {
 
     void Cursor::rewind()
     {
+        this->position = 0;
+        this->loadFirstBatch();
     }
 
     long Cursor::count() {
diff --git a/src/cursor.h b/src/cursor.h
@@ -17,7 +17,7 @@ namespace arangodb { namespace fuerte { namespace php {
     {
     private:
         Connection* connection;
-        Vpack* vpack;
+        Vpack vpack;
 
         bool hasMore;
         int position = 0;
diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -246,4 +246,39 @@ public function it_creates_array_from_cursor()
 
         $this->assertCount(100, $data);
     }
+
+
+    /**
+     * @test
+     */
+    public function it_rewinds_cursor_multiple_times()
+    {
+        $this->connection = TestUtil::getConnection();
+
+        $cursor = $this->connection->query(Vpack::fromArray([
+            'query' => 'FOR i IN 1..100 RETURN [i, i+1]',
+            'batchSize' => 10
+        ]));
+
+        $iterations = 0;
+        $dataSet1 = [];
+        $dataSet2 = [];
+
+        while($cursor->valid()) {
+            $dataSet1[] = $cursor->current();
+            $cursor->next();
+            $iterations++;
+        }
+
+        $cursor->rewind();
+
+        while($cursor->valid()) {
+            $dataSet2[] = $cursor->current();
+            $cursor->next();
+            $iterations++;
+        }
+
+        $this->assertSame(200, $iterations);
+        $this->assertTrue($dataSet1 === $dataSet2);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace arangodb { namespace fuerte { namespace php {`
`4`	`4`
`5`		`- Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(vpack), connection(connection)`
	`5`	`+ Cursor::Cursor(Connection* connection, Vpack* vpack): vpack(*vpack), connection(connection)`
`6`	`6`	`{`
`7`		`- this->loadFirstBatch();`
	`7`	`+ this->rewind();`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`void Cursor::setOption(int option, int value)`
`@@ -18,7 +18,7 @@ namespace arangodb { namespace fuerte { namespace php {`
`18`	`18`
`19`	`19`	`void Cursor::loadFirstBatch()`
`20`	`20`	`{`
`21`		`- Request request("/_api/cursor", this->vpack);`
	`21`	`+ Request request("/_api/cursor", &this->vpack);`
`22`	`22`	`request.setHttpMethod(Request::METHOD_POST);`
`23`	`23`
`24`	`24`	`Response* response = this->connection->sendRequest(&request);`
`@@ -115,6 +115,8 @@ namespace arangodb { namespace fuerte { namespace php {`
`115`	`115`
`116`	`116`	`void Cursor::rewind()`
`117`	`117`	`{`
	`118`	`+ this->position = 0;`
	`119`	`+ this->loadFirstBatch();`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`long Cursor::count() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace arangodb { namespace fuerte { namespace php {`
`17`	`17`	`{`
`18`	`18`	`private:`
`19`	`19`	`Connection* connection;`
`20`		`- Vpack* vpack;`
	`20`	`+ Vpack vpack;`
`21`	`21`
`22`	`22`	`bool hasMore;`
`23`	`23`	`int position = 0;`