Browse Source

Addresses issue with MySQL query counting (#5883)

* Addresses issue with MySQL query counting

See
[issue](https://github.com/TechEmpower/FrameworkBenchmarks/issues/5874)
for details.

* fix travis error

* Reverts and adds 1.5% margin

Co-authored-by: Nate <[email protected]>
Mike Smith 5 years ago
parent
commit
02bbf8595a
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .travis.yml
  2. 1 1
      toolset/databases/mysql/mysql.py

+ 1 - 1
.travis.yml

@@ -48,7 +48,7 @@ env:
     - "TESTDIR=Haskell/wizzardo-inline"
     - "TESTDIR=Haskell/wizzardo-inline"
     - 'TESTDIR="Java/act Java/comsat"'
     - 'TESTDIR="Java/act Java/comsat"'
     - 'TESTDIR="Java/activeweb Java/armeria Java/baratine Java/bayou Java/blade Java/curacao Java/dropwizard Java/firenio Java/servicetalk Java/voovan"'
     - 'TESTDIR="Java/activeweb Java/armeria Java/baratine Java/bayou Java/blade Java/curacao Java/dropwizard Java/firenio Java/servicetalk Java/voovan"'
-    - 'TESTDIR="Java/gemini Java/greenlightning Java/grizzly Java/helidon Java/httpserver Java/jetty Java/jlhttp Java/jooby2 Java/wicket"'
+    - 'TESTDIR="Java/gemini Java/greenlightning Java/grizzly Java/helidon Java/httpserver Java/jetty Java/jlhttp Java/jooby Java/wicket"'
     - 'TESTDIR="Java/light-java Java/minijax Java/nanohttpd Java/netty Java/ninja-standalone Java/officefloor Java/proteus Java/quarkus"'
     - 'TESTDIR="Java/light-java Java/minijax Java/nanohttpd Java/netty Java/ninja-standalone Java/officefloor Java/proteus Java/quarkus"'
     - 'TESTDIR="Java/rapidoid Java/redkale Java/restexpress Java/revenj-jvm Java/servlet Java/servlet3 Java/smart-socket Java/spark"'
     - 'TESTDIR="Java/rapidoid Java/redkale Java/restexpress Java/revenj-jvm Java/servlet Java/servlet3 Java/smart-socket Java/spark"'
     - 'TESTDIR="Java/spring Java/spring-webflux Java/t-io Java/tapestry Java/undertow Java/undertow-jersey Java/vertx Java/vertx-web Java/simple-server"'
     - 'TESTDIR="Java/spring Java/spring-webflux Java/t-io Java/tapestry Java/undertow Java/undertow-jersey Java/vertx Java/vertx-web Java/simple-server"'

+ 1 - 1
toolset/databases/mysql/mysql.py

@@ -55,7 +55,7 @@ class Database(AbstractDatabase):
         res = 0
         res = 0
         records = cursor.fetchall()
         records = cursor.fetchall()
         for row in records:
         for row in records:
-            res = res + int(row[1])
+            res = res + int(int(row[1]) * cls.margin)
         return res
         return res
 
 
     @classmethod
     @classmethod