Added conn->server, values(), r.uuid(str)

Author: Daniel Mewes

pb4php/compile.php

@@ -6,5 +6,5 @@
 $rdbProtocolParser->parse(
     __DIR__ . '/ql2.proto',
     'r\ProtocolBuffer', // namespace
-    __DIR__ . '/../src/ProtocolBuffer' //destination dir
+    __DIR__ . '/../rdb/ProtocolBuffer' //destination dir
 );

pb4php/ql2.proto

@@ -112,6 +112,9 @@ message Response {
                                // more of the sequence.  Keep sending [CONTINUE]
                                // queries until you get back [SUCCESS_SEQUENCE].
         WAIT_COMPLETE     = 4; // A [NOREPLY_WAIT] query completed.
+        SERVER_INFO       = 5; // The data for a [SERVER_INFO] request.  This is
+                               // the same as `SUCCESS_ATOM` except that there will
+                               // never be profiling data.
 
         // These response types indicate failure.
         CLIENT_ERROR  = 16; // Means the client is buggy.  An example is if the
@@ -331,6 +334,8 @@ message Term {
                          // | Sequence, STRING -> Sequence
         // Return an array containing the keys of the object.
         KEYS = 94; // OBJECT -> ARRAY
+        // Return an array containing the values of the object.
+        VALUES = 186; // OBJECT -> ARRAY
         // Creates an object
         OBJECT = 143; // STRING, DATUM, ... -> OBJECT
         // Check whether an object contains all the specified fields,
@@ -730,6 +735,7 @@ message Term {
 // * A [STOP] query with the same token as a [START] query that you want to stop.
 // * A [NOREPLY_WAIT] query with a unique per-connection token. The server answers
 //   with a [WAIT_COMPLETE] [Response].
+// * A [SERVER_INFO] query. The server answers with a [SERVER_INFO] [Response].
 message Query {
     enum QueryType {
         START    = 1; // Start a new query.
@@ -738,6 +744,7 @@ message Query {
         STOP     = 3; // Stop a query partway through executing.
         NOREPLY_WAIT = 4;
                       // Wait for noreply operations to finish.
+        SERVER_INFO = 5; // Get server information.
     }
     optional QueryType type = 1;
     // A [Term] is how we represent the operations we want a query to perform.

rdb/Connection.php

@@ -166,6 +166,30 @@ public function noreplyWait()
         }
     }
 
+    public function server()
+    {
+        if (!$this->isOpen()) {
+            throw new RqlDriverError("Not connected.");
+        }
+
+        // Generate a token for the request
+        $token = $this->generateToken();
+
+        // Send the request
+        $jsonQuery = array(QueryQueryType::PB_SERVER_INFO);
+        $this->sendQuery($token, $jsonQuery);
+
+        // Await the response
+        $response = $this->receiveResponse($token);
+
+        if ($response['t'] != ResponseResponseType::PB_SERVER_INFO) {
+            throw new RqlDriverError("Unexpected response type to server info query.");
+        }
+
+        $toNativeOptions = array();
+        return $this->createDatumFromResponse($response)->toNative($toNativeOptions);
+    }
+
     public function run(Query $query, $options = array(), &$profile = '')
     {
         if (isset($options) && !is_array($options)) {

rdb/ProtocolBuffer/QueryQueryType.php

@@ -6,6 +6,7 @@ class QueryQueryType
 {
     const PB_CONTINUE      = 2;
     const PB_NOREPLY_WAIT  = 4;
+    const PB_SERVER_INFO   = 5;
     const PB_START         = 1;
     const PB_STOP          = 3;
 }

rdb/ProtocolBuffer/ResponseResponseType.php

@@ -7,6 +7,7 @@ class ResponseResponseType
     const PB_CLIENT_ERROR      = 16;
     const PB_COMPILE_ERROR     = 17;
     const PB_RUNTIME_ERROR     = 18;
+    const PB_SERVER_INFO       = 5;
     const PB_SUCCESS_ATOM      = 1;
     const PB_SUCCESS_PARTIAL   = 3;
     const PB_SUCCESS_SEQUENCE  = 2;

rdb/ProtocolBuffer/TermTermType.php

@@ -172,6 +172,7 @@ class TermTermType
     const PB_UPCASE              = 141;
     const PB_UPDATE              = 53;
     const PB_UUID                = 169;
+    const PB_VALUES              = 186;
     const PB_VAR                 = 10;
     const PB_WAIT                = 177;
     const PB_WEDNESDAY           = 109;

rdb/Queries/Manipulation/Values.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace r\Queries\Manipulation;
+
+use r\ValuedQuery\ValuedQuery;
+use r\ProtocolBuffer\TermTermType;
+
+class Values extends ValuedQuery
+{
+    public function __construct(ValuedQuery $sequence)
+    {
+        $this->setPositionalArg(0, $sequence);
+    }
+
+    protected function getTermType()
+    {
+        return TermTermType::PB_VALUES;
+    }
+}

rdb/Queries/Misc/Uuid.php

@@ -7,6 +7,14 @@
 
 class Uuid extends ValuedQuery
 {
+    public function __construct($str = null)
+    {
+        if (isset($str))
+        {
+            $this->setPositionalArg(0, $this->nativeToDatum($str));
+        }
+    }
+
     protected function getTermType()
     {
         return TermTermType::PB_UUID;

rdb/ValuedQuery/ValuedQuery.php

@@ -53,6 +53,7 @@
 use r\Queries\Manipulation\HasFields;
 use r\Queries\Manipulation\InsertAt;
 use r\Queries\Manipulation\Keys;
+use r\Queries\Manipulation\Values;
 use r\Queries\Manipulation\Merge;
 use r\Queries\Manipulation\Pluck;
 use r\Queries\Manipulation\Prepend;
@@ -307,6 +308,10 @@ public function keys()
     {
         return new Keys($this);
     }
+    public function values()
+    {
+        return new Values($this);
+    }
     public function add($other)
     {
         return new Add($this, $other);

rdb/global.php

@@ -408,9 +408,9 @@ function distance($g1, $g2, $opts = null)
     return new Distance($g1, $g2, $opts);
 }
 
-function uuid()
+function uuid($str = null)
 {
-    return new Uuid();
+    return new Uuid($str);
 }
 
 function minval()