Ericsson · whisperity · Jul 31, 2017 · Jul 18, 2017
diff --git a/api/report_server.thrift b/api/report_server.thrift
@@ -158,7 +158,7 @@ typedef list<CommentData> CommentDataList
 service codeCheckerDBAccess {
 
   // get the run Ids and dates from the database to select one run
-  RunDataList getRunData()
+  RunDataList getRunData(1: string runNameFilter)
                          throws (1: shared.RequestFailed requestError),
 
   ReportData getReport(

diff --git a/libcodechecker/cmd/cmd_line_client.py b/libcodechecker/cmd/cmd_line_client.py
@@ -48,7 +48,7 @@ def get_run_ids(client):
     Returns a map for run names and run_ids.
     """
 
-    runs = client.getRunData()
+    runs = client.getRunData(None)
    
     run_data = {}
     for run in runs:
@@ -112,7 +112,7 @@ def add_filter_conditions(report_filter, filter_str):
 
 def handle_list_runs(args):
     client = setup_client(args.host, args.port, '/')
-    runs = client.getRunData()
+    runs = client.getRunData(None)
 
     if args.output_format == 'json':
         results = []

diff --git a/libcodechecker/libclient/thrift_helper.py b/libcodechecker/libclient/thrift_helper.py
@@ -73,7 +73,7 @@ def wrapper(self, *args, **kwargs):
         return wrapper
 
     @ThriftClientCall
-    def getRunData(self):
+    def getRunData(self, runNameFilter):
         pass
 
     @ThriftClientCall

diff --git a/libcodechecker/server/client_db_access_handler.py b/libcodechecker/server/client_db_access_handler.py
@@ -260,7 +260,7 @@ def __queryResults(self, run_id, limit, offset, sort_types,
                                               msg)
 
     @timeit
-    def getRunData(self):
+    def getRunData(self, run_name_filter):
 
         session = self.__session
         results = []
@@ -273,8 +273,12 @@ def getRunData(self):
                 .group_by(Report.run_id) \
                 .subquery()
 
-            q = session.query(Run, stmt.c.report_count) \
-                .outerjoin(stmt, Run.id == stmt.c.run_id) \
+            q = session.query(Run, stmt.c.report_count)
+
+            if run_name_filter is not None:
+                q = q.filter(Run.name.like('%' + run_name_filter + '%'))
+
+            q = q.outerjoin(stmt, Run.id == stmt.c.run_id) \
                 .order_by(Run.date)
 
             for instance, reportCount in q:

diff --git a/tests/functional/comment/test_comment.py b/tests/functional/comment/test_comment.py
@@ -36,7 +36,7 @@ def setUp(self):
         # Get the run names which belong to this test
         run_names = env.get_run_names(self._test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

diff --git a/tests/functional/delete_runs/test_delete_runs.py b/tests/functional/delete_runs/test_delete_runs.py
@@ -58,12 +58,12 @@ def test_multiple_deletion(self):
         """
 
         def all_exists(runs):
-            run_names = [run.name for run in self._cc_client.getRunData()]
+            run_names = [run.name for run in self._cc_client.getRunData(None)]
             print(run_names)
             return set(runs) <= set(run_names)
 
         def none_exists(runs):
-            run_names = [run.name for run in self._cc_client.getRunData()]
+            run_names = [run.name for run in self._cc_client.getRunData(None)]
             return not bool(set(runs).intersection(run_names))
 
         project_name = self._testproject_data['name']
@@ -89,9 +89,9 @@ def none_exists(runs):
 
         # Remove runs before run 2 by run date.
 
-        run2 = next(itertools.ifilter(
-            lambda run: run.name == run2_name, self._cc_client.getRunData()),
-            None)
+        run2 = next(itertools.ifilter(lambda run: run.name == run2_name,
+                    self._cc_client.getRunData(None)), None)
+
         date_run2 = datetime.strptime(run2.runDate, '%Y-%m-%d %H:%M:%S.%f')
         date_run2 = \
             str(date_run2.year) + ':' + \

@@ -51,7 +51,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
         for r in test_runs:

@@ -55,7 +55,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
         test_runs = [run for run in runs if run.name in run_names]
 
     def test_skel(self):

@@ -45,7 +45,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -42,7 +42,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -0,0 +1,57 @@
+#
+# -----------------------------------------------------------------------------
 #                     The CodeChecker Infrastructure
+#   This file is distributed under the University of Illinois Open Source
+#   License. See LICENSE.TXT for details.
+# -----------------------------------------------------------------------------
+
+import os
+import unittest
+
+from libtest import env
+
+
+class TestRunFilter(unittest.TestCase):
+
+    _ccClient = None
+
+    def setUp(self):
+        test_workspace = os.environ['TEST_WORKSPACE']
+
+        test_class = self.__class__.__name__
+        print('Running ' + test_class + ' tests in ' + test_workspace)
+
+        self._testproject_data = env.setup_test_proj_cfg(test_workspace)
+        self.assertIsNotNone(self._testproject_data)
+
+        self._cc_client = env.setup_viewer_client(test_workspace)
+        self.assertIsNotNone(self._cc_client)
+
+        self._run_names = env.get_run_names(test_workspace)
+
+    def __get_runs(self, run_name_filter=None):
+        """ Helper function to get all run names which belong to this test"""
+        runs = self._cc_client.getRunData(run_name_filter)
+
+        return [run for run in runs if run.name in self._run_names]
+
+    def test_filter_run_names(self):
+        # Filter all runs.
+        test_runs = self.__get_runs()
+        self.assertEqual(len(test_runs), 1,
+                         "There should be only one run for this test.")
+
+        # Filter runs which name starts with `test_files_`.
+        test_runs = self.__get_runs('test_files_')
+        self.assertEqual(len(test_runs), 1,
+                         "There should be only one run for this test.")
+
+        # Filter runs which name contains `files`.
+        test_runs = self.__get_runs('files_')
+        self.assertEqual(len(test_runs), 1,
+                         "There should be no run for this test.")
+
+        # Filter non existing run.
+        test_runs = self.__get_runs('non_existing_run_name')
+        self.assertEqual(len(test_runs), 0,
+                         "There should be no run for this test.")
@@ -43,7 +43,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -38,7 +38,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -30,7 +30,7 @@ def setUp(self):
         # Get the run names which belong to this test.
         run_names = env.get_run_names(test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -34,7 +34,7 @@ def setUp(self):
         # Get the run names which belong to this test
         run_names = env.get_run_names(self._test_workspace)
 
-        runs = self._cc_client.getRunData()
+        runs = self._cc_client.getRunData(None)
 
         test_runs = [run for run in runs if run.name in run_names]
 

@@ -277,7 +277,7 @@ def measure(test_conf,
             with CCViewerHelper(view_host, view_port, '/') as viewer_client:
 
                 with Timer('getRunData', run_perf):
-                    viewer_client.getRunData()
+                    viewer_client.getRunData(None)
 
                 with Timer('getAllRunResulst', run_perf):
                     res = get_all_run_results(viewer_client, run_id)

@@ -11,11 +11,12 @@ define([
   'dojo/topic',
   'dijit/Dialog',
   'dijit/form/Button',
+  'dijit/form/TextBox',
   'dijit/layout/BorderContainer',
   'dijit/layout/ContentPane',
   'dojox/grid/DataGrid'],
 function (declare, domConstruct, ItemFileWriteStore, topic, Dialog, Button,
-  BorderContainer, ContentPane, DataGrid) {
+  TextBox, BorderContainer, ContentPane, DataGrid) {
 
   function prettifyDuration(seconds) {
     var prettyDuration = "--------";
@@ -137,33 +138,70 @@ function (declare, domConstruct, ItemFileWriteStore, topic, Dialog, Button,
       return result;
     },
 
-    _populateRuns : function () {
+    /**
+     * Sorts run data list by date (newest comes first).
+     */
+    _sortRunData : function (runDataList) {
+      runDataList.sort(function (lhs, rhs) {
+        return new Date(rhs.runDate) - new Date(lhs.runDate);
+      });
+    },
+
+    /**
+     * This function refreshes grid with available run data based on text run
+     * name filter.
+     */
+    refreshGrid : function (runNameFilter) {
       var that = this;
 
-      CC_SERVICE.getRunData(function (runDataList) {
-        runDataList.sort(function (lhs, rhs) {
-          return new Date(rhs.runDate) - new Date(lhs.runDate);
+      this.store.fetch({
+        onComplete : function (runs) {
+          runs.forEach(function (run) {
+            that.store.deleteItem(run);
+          });
+          that.store.save();
+        }
+      });
+
+      CC_SERVICE.getRunData(runNameFilter, function (runDataList) {
+        that._sortRunData(runDataList);
+        runDataList.forEach(function (item) {
+          that._addRunData(item);
         });
+      });
+    },
+
+    /**
+     * This function adds a new run data to the store.
+     */
+    _addRunData : function (runData) {
+      var currItemDate = runData.runDate.split(/[\s\.]+/);
+      this.store.newItem({
        id           : runData.runId,
+        runid        : runData.runId,
+        name         : '<span class="link">' + runData.name + '</span>',
+        date         : currItemDate[0] + ' ' + currItemDate[1],
+        numberofbugs : runData.resultCount,
+        duration     : prettifyDuration(runData.duration),
+        runData      : runData,
+        checkcmd     : '<span class="link">Show</span>',
+        del          : false,
+        diff         : false
+      });
+    },
+
+    _populateRuns : function (runNameFilter) {
+      var that = this;
+
+      CC_SERVICE.getRunData(runNameFilter, function (runDataList) {
+        that._sortRunData(runDataList);
 
         that.onLoaded(runDataList);
         topic.publish("hooks/RunsListed", runDataList.length);
 
         runDataList.forEach(function (item) {
-          var currItemDate = item.runDate.split(/[\s\.]+/);
           topic.publish("hooks/run/Observed", item);
-
-          that.store.newItem({
-            diff : false,
-            id : item.runId,
-            runid : item.runId,
-            name : '<span class="link">' + item.name + '</span>',
-            date : currItemDate[0] + ' ' + currItemDate[1],
-            numberofbugs : item.resultCount,
-            duration : prettifyDuration(item.duration),
-            del : false,
-            runData : item,
-            checkcmd : '<span class="link">Show</span>'
-          });
+          that._addRunData(item);
         });
       });
     },
@@ -285,10 +323,38 @@ function (declare, domConstruct, ItemFileWriteStore, topic, Dialog, Button,
     }
   });
 
+  var RunFilter = declare(ContentPane, {
+    constructor : function () {
+      var that = this;
+
+      this._runFilter = new TextBox({
+        id          : 'runs-filter',
+        placeHolder : 'Search for runs...',
+        onKeyUp    : function (evt) {
+          clearTimeout(this.timer);
+
+          var filter = this.get('value');
+          this.timer = setTimeout(function () {
+            that.listOfRunsGrid.refreshGrid(filter);
+          }, 500);
+        }
+      });
+    },
+
+    postCreate : function () {
+      this.addChild(this._runFilter);
+    }
+  });
+
   return declare(BorderContainer, {
     postCreate : function () {
       var that = this;
 
+      var filterPane = new RunFilter({
+        id : 'runs-filter-container',
+        region : 'top'
+      });
+
       var runsInfoPane = new RunsInfoPane({
         region : 'bottom'
       });
@@ -300,7 +366,9 @@ function (declare, domConstruct, ItemFileWriteStore, topic, Dialog, Button,
       });
 
       runsInfoPane.set('listOfRunsGrid', listOfRunsGrid);
+      filterPane.set('listOfRunsGrid', listOfRunsGrid);
 
+      this.addChild(filterPane);
       this.addChild(runsInfoPane);
       this.addChild(listOfRunsGrid);
     },