Lithium: Switch back to gcc and benchmark number of sql connections. (T…

…echEmpower#5903)

* Benchmark number of sql connections.

* Lithium: fix default test.

* Lithium: re-run travis.

frameworks/C++/lithium/compile_and_start_gcc.sh

@@ -0,0 +1,20 @@
+#! /bin/sh
+
+DB_FLAG=$1
+N_SQL_CONNECTIONS=$2
+COMMIT=2ea53ab949627baeaaad77e7662da74f9a9d0a31
+
+if [ $DB_FLAG = "TFB_MYSQL" ]; then
+  CXX_FLAGS="-I /usr/include/mariadb  -lmariadbclient "
+  wget https://raw.githubusercontent.com/matt-42/lithium/$COMMIT/single_headers/lithium_mysql.hh
+elif [ $DB_FLAG = "TFB_PGSQL" ]; then
+  CXX_FLAGS="-I/usr/include/postgresql -I /usr/include/postgresql/12/server -lpthread -lpq"
+  wget https://raw.githubusercontent.com/matt-42/lithium/$COMMIT/single_headers/lithium_pgsql.hh
+fi
+
+
+wget https://raw.githubusercontent.com/matt-42/lithium/$COMMIT/single_headers/lithium_http_backend.hh
+
+g++ -flto -DNDEBUG -DN_SQL_CONNECTIONS=$N_SQL_CONNECTIONS -D$DB_FLAG -O3 -march=native -std=c++17 ./lithium.cc $CXX_FLAGS -lpthread -lboost_context -lssl -lcrypto -o /lithium_tbf
+
+/lithium_tbf tfb-database 8080

frameworks/C++/lithium/lithium-mysql-1.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 1

frameworks/C++/lithium/lithium-mysql-10.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 10

frameworks/C++/lithium/lithium-mysql-2.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 2

frameworks/C++/lithium/lithium-mysql-3.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 3

frameworks/C++/lithium/lithium-mysql-4.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 4

frameworks/C++/lithium/lithium-mysql-5.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 5

frameworks/C++/lithium/lithium-mysql-6.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 6

frameworks/C++/lithium/lithium-mysql-7.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 7

frameworks/C++/lithium/lithium-mysql-8.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 8

frameworks/C++/lithium/lithium-mysql-9.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 9

frameworks/C++/lithium/lithium-postgres-1.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 1

frameworks/C++/lithium/lithium-postgres-10.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 10

frameworks/C++/lithium/lithium-postgres-2.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 2

frameworks/C++/lithium/lithium-postgres-3.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 3

frameworks/C++/lithium/lithium-postgres-4.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 4

frameworks/C++/lithium/lithium-postgres-5.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 5

frameworks/C++/lithium/lithium-postgres-6.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 6

frameworks/C++/lithium/lithium-postgres-7.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 7

frameworks/C++/lithium/lithium-postgres-8.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 8

frameworks/C++/lithium/lithium-postgres-9.dockerfile

@@ -0,0 +1,8 @@
+FROM buildpack-deps:focal
+
+RUN apt-get update -yqq
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+
+COPY ./ ./
+
+CMD ./compile_and_start_gcc.sh TFB_PGSQL 9

frameworks/C++/lithium/lithium-postgres.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:focal
 
 RUN apt-get update -yqq
-RUN apt-get install -yqq clang libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
+RUN apt-get install -yqq g++-9 libboost-dev postgresql-server-dev-all libpq-dev wget libboost-context-dev
 
 COPY ./ ./
 
-CMD ./compile_and_start.sh TFB_PGSQL
+CMD ./compile_and_start_gcc.sh TFB_PGSQL NCONN

frameworks/C++/lithium/lithium.cc

@@ -71,17 +71,22 @@ int main(int argc, char* argv[]) {
     s::id(s::auto_increment, s::primary_key) = int(),
     s::randomNumber = int());
 
-#if TFB_MYSQL
-  int db_nconn = 4;
-  int queries_nconn = 2;
-  int fortunes_nconn = 4;
-  int updates_nconn = 1;
-#elif TFB_PGSQL
-  int db_nconn = 7;
-  int queries_nconn = 4;
-  int fortunes_nconn = 7;
-  int updates_nconn = 3;
-#endif
+// #if TFB_MYSQL
+//   int db_nconn = 4;
+//   int queries_nconn = 2;
+//   int fortunes_nconn = 4;
+//   int updates_nconn = 1;
+// #elif TFB_PGSQL
+//   int db_nconn = 7;
+//   int queries_nconn = 4;
+//   int fortunes_nconn = 7;
+//   int updates_nconn = 3;
+// #endif
+
+  int db_nconn = N_SQL_CONNECTIONS;
+  int queries_nconn = N_SQL_CONNECTIONS;
+  int fortunes_nconn = N_SQL_CONNECTIONS;
+  int updates_nconn = N_SQL_CONNECTIONS;
 
   http_api my_api;
 

frameworks/C++/lithium/lithium.dockerfile

@@ -1,8 +1,8 @@
 FROM buildpack-deps:focal
 
 RUN apt-get update -yqq
-RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev clang
+RUN apt-get install -yqq libboost-dev libmariadb-dev wget  libboost-context-dev g++-9
 
 COPY ./ ./
 
-CMD ./compile_and_start.sh TFB_MYSQL
+CMD ./compile_and_start_gcc.sh TFB_MYSQL 20