Upgrade to Hunt 1.2.x (TechEmpower#4846)

* Upgrade to Hunt 1.2.x

* Rename docker file

* Adjust the upper bound for random id

Author: Heromyth

frameworks/D/hunt/build.sh

@@ -5,3 +5,9 @@ git clone https://github.com/h2o/picohttpparser.git
 cp patches/Makefile picohttpparser
 cd picohttpparser
 make package
+
+
+rm -rf http-parser
+git clone https://github.com/nodejs/http-parser.git
+cd http-parser
+make package

frameworks/D/hunt/dub.json

@@ -6,7 +6,7 @@
 	"homepage": "https://www.huntlabs.net",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"hunt": "~>1.2.0",
+		"hunt": "~>1.2.2",
 		"hunt-database": "~>1.2.0",
 		"std_data_json": "~>0.18.2"
 	},
@@ -16,6 +16,7 @@
 	"configurations": [
 		{
 			"name": "default",
+			"sourcePaths": ["http"],
 			"libs-posix": [
 				"http_parser"
 			],
@@ -28,6 +29,7 @@
 		},
 		{
 			"name": "minihttp",
+			"sourcePaths": ["pico"],
 			"libs-posix": [
 				"picohttpparser"
 			],
@@ -37,9 +39,22 @@
 			"versions": [
 				"MINIHTTP"
 			]
+		},
+		{
+			"name": "mmap",
+			"sourcePaths": ["mmap"],
+			"libs-posix": [
+				"picohttpparser"
+			],
+			"lflags-posix": [
+				"-Lpicohttpparser/"
+			],
+			"versions": [
+				"MMAP"
+			]
 		}
 	],
 	"subConfigurations": {
 		"hunt-database": "postgresql"
 	}
-}
+}

frameworks/D/hunt/http/app.d

@@ -0,0 +1,47 @@
+/*
+ * Collie - An asynchronous event-driven network framework using Dlang development
+ *
+ * Copyright (C) 2015-2018  Shanghai Putao Technology Co., Ltd 
+ *
+ * Developer: Putao's Dlang team
+ *
+ * Licensed under the Apache-2.0 License.
+ *
+ */
+import std.getopt;
+import std.stdio;
+
+import hunt.database;
+import hunt.io;
+import hunt.system.Memory : totalCPUs;
+import http.Processor;
+import http.Server;
+import http.DemoProcessor;
+
+void main(string[] args) {
+	ushort port = 8080;
+	GetoptResult o = getopt(args, "port|p", "Port (default 8080)", &port);
+	if (o.helpWanted) {
+		defaultGetoptPrinter("A simple http server powered by Hunt!", o.options);
+		return;
+	}
+
+	version (POSTGRESQL) {
+		DatabaseOption options;
+		debug {
+			options = new DatabaseOption(
+					"postgresql://benchmarkdbuser:benchmarkdbpass@10.1.11.44:5432/hello_world?charset=utf-8");
+		} else {
+			options = new DatabaseOption(
+					"postgresql://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world?charset=utf-8");
+		}
+						
+		options.setMinimumConnection(totalCPUs*3);
+		options.setMaximumConnection(totalCPUs*3);
+		dbConnection = new Database(options);
+	}
+
+	AbstractTcpServer httpServer = new HttpServer!(DemoProcessor)("0.0.0.0", port, totalCPUs);
+	writefln("listening on http://%s", httpServer.bindingAddress.toString());
+	httpServer.start();
+}

frameworks/D/hunt/source/http/DemoProcessor.d renamed to frameworks/D/hunt/http/http/DemoProcessor.d

@@ -1,6 +1,6 @@
 module http.DemoProcessor;
 
-version(HTTP) :
+
 
 // import stdx.data.json;
 import std.json;
@@ -150,7 +150,7 @@ class DemoProcessor : HttpProcessor {
 
 
         private void respondSingleQuery() {
-            int id = uniform(1, 10000);
+            int id = uniform(1, 10001);
             string query = "SELECT randomNumber FROM world WHERE id = " ~ id.to!string;
             ResultSet rs = dbConnection.query(query);
 
@@ -168,7 +168,7 @@ class DemoProcessor : HttpProcessor {
 
             JSONValue[] arr = new JSONValue[queries];
             for (int i = 0; i < queries; i++) {
-                immutable id = uniform(1, 10000);
+                immutable id = uniform(1, 10001);
                 immutable query = "SELECT randomNumber FROM world WHERE id = " ~ id.to!string;
                 ResultSet rs = dbConnection.query(query);
 
@@ -224,14 +224,14 @@ class DemoProcessor : HttpProcessor {
 
             JSONValue[] arr = new JSONValue[queries];
             for (int i = 0; i < queries; i++) {
-                immutable id = uniform(1, 10000);
+                immutable id = uniform(1, 10001);
                 immutable idString = id.to!string;
                 immutable query = "SELECT randomNumber FROM world WHERE id = " ~ idString;
                 ResultSet rs = dbConnection.query(query);
                 int randomNumber = to!int(rs.front()[0]);
                 debug tracef("id=%d, randomNumber=%d", id, randomNumber);
 
-                randomNumber = uniform(1, 10000);
+                randomNumber = uniform(1, 10001);
                 string updateSql = "UPDATE world SET randomNumber = "
                     ~ randomNumber.to!string ~ "  WHERE id = " ~ idString;
                 int r = dbConnection.execute(updateSql);

frameworks/D/hunt/source/http/HttpURI.d renamed to frameworks/D/hunt/http/http/HttpURI.d

@@ -1,6 +1,6 @@
 module http.HttpURI;
 
-version(HTTP) :
+
 
 import hunt.collection.MultiMap;
 

frameworks/D/hunt/source/http/Parser.d renamed to frameworks/D/hunt/http/http/Parser.d

@@ -2,7 +2,7 @@
 /// Used for benchmarks with simple server
 module http.Parser;
 
-version(HTTP) :
+
 
 private:
 

frameworks/D/hunt/source/http/Processor.d renamed to frameworks/D/hunt/http/http/Processor.d

@@ -2,7 +2,7 @@
 ///
 module http.Processor;
 
-version(HTTP) :
+
 
 import std.array, std.exception, std.format, std.algorithm.mutation, std.socket;
 import core.stdc.stdlib;

frameworks/D/hunt/source/http/Server.d renamed to frameworks/D/hunt/http/http/Server.d

@@ -1,6 +1,6 @@
 module http.Server;
 
-version(HTTP) :
+
 
 import hunt.event;
 import hunt.io;

frameworks/D/hunt/source/http/UrlEncoded.d renamed to frameworks/D/hunt/http/http/UrlEncoded.d

@@ -1,6 +1,6 @@
 module http.UrlEncoded;
 
-version(HTTP) :
+
 
 import hunt.collection.List;
 import hunt.collection.MultiMap;

frameworks/D/hunt/hunt-dmd.dockerfile

@@ -12,6 +12,6 @@ RUN git clone https://github.com/h2o/picohttpparser.git && \
     cd ..
 
 RUN dub upgrade --verbose
-RUN dub build --build=release --arch=x86_64 --compiler=dmd  -c=minihttp
+RUN dub build --build=release --arch=x86_64 --compiler=dmd  -c=mmap -f
 
 CMD ["./hunt-minihttp"]