Add selectbox for server name

perftools · Jan 19, 2022 · 6901f23 · 6901f23
1 parent a07f3d1
commit 6901f23
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -102,6 +102,7 @@ NOTE: PDO may not support all the features of XHGui, see [#320].
    > db.results.ensureIndex( { 'profile.main().cpu' : -1 } )
    > db.results.ensureIndex( { 'meta.url' : 1 } )
    > db.results.ensureIndex( { 'meta.simple_url' : 1 } )
+   > db.results.ensureIndex( { 'meta.SERVER.SERVER_NAME' : 1 } )
    ```
 
 7. Install dependencies with composer
@@ -271,11 +272,13 @@ storage.)
 | Searcher::getAllWatches()       | ✓        | ✓ [#435] |
 | Searcher::truncateWatches()     | ✓        | ✓ [#435] |
 | Searcher::stats()               | ✗ [#305] | ✓        |
+| Searcher::getAllServerNames()   | ✓ [#460] | ✗        |
 
 [#305]: https://github.com/perftools/xhgui/pull/305
 [#384]: https://github.com/perftools/xhgui/pull/384
 [#435]: https://github.com/perftools/xhgui/pull/435
 [#436]: https://github.com/perftools/xhgui/pull/436
+[#460]: https://github.com/perftools/xhgui/pull/460
 
 # Releases / Changelog
 

diff --git a/mongo.init.d/xhgui.js b/mongo.init.d/xhgui.js
@@ -3,3 +3,4 @@ db.results.ensureIndex( { 'profile.main().wt' : -1 } );
 db.results.ensureIndex( { 'profile.main().mu' : -1 } );
 db.results.ensureIndex( { 'profile.main().cpu' : -1 } );
 db.results.ensureIndex( { 'meta.url' : 1 } );
+db.results.ensureIndex( { 'meta.SERVER.SERVER_NAME' : 1 } );
diff --git a/src/Controller/RunController.php b/src/Controller/RunController.php
@@ -47,6 +47,8 @@ public function index(Request $request): void
             'projection' => true,
         ]));
 
+        $serverNames = $this->searcher->getAllServerNames();
+
         $title = 'Recent runs';
         $titleMap = [
             'wt' => 'Longest wall time',
@@ -71,6 +73,7 @@ public function index(Request $request): void
             'search' => $search,
             'has_search' => implode('', $search) !== '',
             'title' => $title,
+            'server_names' => $serverNames,
         ]);
     }
 

diff --git a/src/Searcher/MongoSearcher.php b/src/Searcher/MongoSearcher.php
@@ -364,4 +364,12 @@ public function stats(): array
             'bytes' => 0,
         ];
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllServerNames()
+    {
+        return $this->_collection->distinct('meta.SERVER.SERVER_NAME');
+    }
 }
diff --git a/src/Searcher/PdoSearcher.php b/src/Searcher/PdoSearcher.php
@@ -226,6 +226,14 @@ public function stats()
         return $row;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getAllServerNames()
+    {
+        return null;
+    }
+
     /**
      * {@inheritdoc}
      */

diff --git a/src/Searcher/SearcherInterface.php b/src/Searcher/SearcherInterface.php
@@ -140,4 +140,11 @@ public function truncateWatches();
      * @return array array of stats
      */
     public function stats();
+
+    /**
+     * Get all the known server names.
+     *
+     * @return array|null array of server names or null if not supported
+     */
+    public function getAllServerNames();
 }
diff --git a/templates/runs/list.twig b/templates/runs/list.twig
@@ -30,7 +30,16 @@
         <div class="control-group span4">
             <label class="control-label" for="server-name">Server Name</label>
             <div class="controls">
-                <input type="text" id="server-name" name="server_name" value="{{ search.server_name }}">
+                {% if server_names is iterable %}
+                    <select id="server-name" name="server_name">
+                        {% for server_name in server_names %}
+                            <option></option>
+                            <option value="{{ server_name }}"{% if server_name == search.server_name %} selected{% endif %}>{{ server_name }}</option>
+                        {% endfor %}
+                    </select>
+                {% else %}
+                    <input type="text" id="server-name" name="server_name" value="{{ search.server_name }}">
+                {% endif %}
             </div>
             <label class="control-label" for="url">URL</label>
             <div class="controls">

diff --git a/tests/Searcher/MongoTest.php b/tests/Searcher/MongoTest.php
@@ -254,4 +254,12 @@ public function testTruncateWatchesPreserveIndexes(): void
             $this->assertEquals($options['name'], $name);
         }
     }
+
+    public function testGetAllServerNames(): void
+    {
+        $result = $this->mongo->getAllServerNames();
+        $this->assertCount(2, $result);
+        $this->assertContains('localhost', $result);
+        $this->assertContains('foo', $result);
+    }
 }
diff --git a/tests/fixtures/normalized.json b/tests/fixtures/normalized.json
@@ -279,5 +279,25 @@
                 "pmu": 0
             }
         }
+    },
+    {
+        "_id": "aaaaaaaaaaaaaaaaaaaaaab2",
+        "meta": {
+            "url": "/bar",
+            "simple_url": "/bar",
+            "get": [],
+            "env": [],
+            "SERVER": {"REQUEST_TIME": 1358614812, "SERVER_NAME": "foo", "REQUEST_METHOD": "GET"},
+            "request_ts_micro": {"sec": 1358614812, "usec": 123456}
+        },
+        "profile": {
+            "main()": {
+                "ct": 1,
+                "wt": 10,
+                "cpu": 12,
+                "mu": 3000,
+                "pmu": 3001
+            }
+        }
     }
 ]