Merge pull request #74 from Zwartpet/patch/line-protocol

Implemented comma, equal sign and space escaping

Author: wdalmut

src/Adapter/WriterTrait.php

@@ -52,8 +52,8 @@ protected function tagsToString(array $tags)
     {
         $tagLine = "";
         if (count($tags) > 0) {
-            array_walk($tags, function(&$value, $key) {
-                $value = "{$key}={$value}";
+            array_walk($tags, function (&$value, $key) {
+                $value = "{$this->addSlashes($key)}={$this->addSlashes($value)}";
             });
             $tagLine = sprintf(",%s", implode(",", $tags));
         }
@@ -63,15 +63,15 @@ protected function tagsToString(array $tags)
 
     protected function pointsToString(array $elements)
     {
-        array_walk($elements, function(&$value, $key) {
+        array_walk($elements, function (&$value, $key) {
             $dataType = gettype($value);
             if (!in_array($dataType, ["string", "double", "boolean", "integer"])) {
                 $dataType = "serializable";
             }
             $dataType = ucfirst($dataType);
             if ($dataType!='Null') {
                 $value = call_user_func([$this, "convert{$dataType}"], $value);
-                $value = "{$key}={$value}";
+                $value = "{$this->addSlashes($key)}={$value}";
             }
         });
         $elements = array_filter($elements);
@@ -102,4 +102,23 @@ protected function convertBoolean($value)
     {
         return (($value) ? "true" : "false");
     }
+
+    /**
+     * Returns strings with space, comma, or equals sign characters backslashed per Influx write protocol syntax
+     *
+     * @param string $value
+     * @return string
+     */
+    private function addSlashes($value)
+    {
+        return str_replace([
+            ' ',
+            ',',
+            '='
+        ], [
+            '\ ',
+            '\,',
+            '\='
+        ], $value);
+    }
 }

src/Client.php

@@ -45,4 +45,4 @@ public function query($query)
     {
         return $this->getReader()->query($query);
     }
-}
+}

tests/unit/Adapter/WriterTraitTest.php

@@ -25,6 +25,8 @@ public function getElements()
     {
         return [
             [["one" => "two"], "one=\"two\""],
+            [["one with space" => "two"], "one\\ with\\ space=\"two\""],
+            [["one with,comma" => "two"], "one\\ with\\,comma=\"two\""],
             [["one" => "two", "three" => "four"], "one=\"two\",three=\"four\""],
             [["one" => true, "three" => false], "one=true,three=false"],
             [["one" => true, "three" => 0., "four" => 1.], "one=true,three=0,four=1"],