Moved message generation and index logic to shared Tester class

Author: Mpdreamz

src/ProtocolLoadTest/HttpTester.cs

@@ -7,11 +7,9 @@ namespace ProtocolLoadTest
 {
     internal class HttpTester : Tester, ITester
     {
-        // Number of messages sent by all HttpTester instances
-        private static int NumSent;
-
         public void Run(string indexName, int port, int numMessages, int bufferSize)
         {
+			// refresh = false is default on elasticsearch's side.
             var bulkParms = new SimpleBulkParameters() { Refresh = false };
 
             var settings = new ConnectionSettings("localhost", port)
@@ -21,29 +19,7 @@ public void Run(string indexName, int port, int numMessages, int bufferSize)
 
             Connect(client, settings);
 
-            IList<Message> msgBuffer = new List<Message>(bufferSize);
-
-            var msgGenerator = new MessageGenerator();
-
-            foreach (var msg in msgGenerator.Generate(numMessages))
-            {
-                msgBuffer.Add(msg);
-
-                // Flush buffer once max size reached
-                if (msgBuffer.Count >= bufferSize)
-                {
-                    client.IndexMany(msgBuffer, indexName, bulkParms);
-                    msgBuffer.Clear();
-
-                    Interlocked.Add(ref NumSent, bufferSize);
-
-                    // Output how many messages sent so far
-                    if (NumSent % 10000 == 0)
-                    {
-                        Console.WriteLine("Sent {0:0,0} messages over HTTP", NumSent);
-                    }
-                }
-            }
+			GenerateAndIndex(indexName, numMessages, bufferSize, bulkParms, client);
         }
     }
 }

src/ProtocolLoadTest/Program.cs

@@ -23,11 +23,11 @@ class Program
 
         static void Main(string[] args)
         {
-            double httpRate = RunTest<HttpTester>(HTTP_PORT);
+            //double httpRate = RunTest<HttpTester>(HTTP_PORT);
             double thriftRate = RunTest<ThriftTester>(THRIFT_PORT);
 
             Console.WriteLine();
-            Console.WriteLine("HTTP: {0:0,0}/s", httpRate);
+            //Console.WriteLine("HTTP: {0:0,0}/s", httpRate);
             Console.WriteLine("Thrift: {0:0,0}/s", thriftRate);
 
             Console.ReadLine();

src/ProtocolLoadTest/Tester.cs

@@ -1,10 +1,15 @@
 using System;
 using Nest;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace ProtocolLoadTest
 {
     internal abstract class Tester
     {
+		// Number of messages sent by all ThriftTester instances
+		private static int NumSent;
+
         protected void Connect(ElasticClient client, ConnectionSettings settings)
         {
             ConnectionStatus indexConnectionStatus;
@@ -17,5 +22,31 @@ protected void Connect(ElasticClient client, ConnectionSettings settings)
                 return;
             }
         }
+		protected static void GenerateAndIndex(string indexName, int numMessages, int bufferSize, SimpleBulkParameters bulkParms, ElasticClient client)
+		{
+			IList<Message> msgBuffer = new List<Message>(bufferSize);
+
+			var msgGenerator = new MessageGenerator();
+
+			foreach (var msg in msgGenerator.Generate(numMessages))
+			{
+				msgBuffer.Add(msg);
+
+				// Flush buffer once max size reached
+				if (msgBuffer.Count >= bufferSize)
+				{
+					client.IndexMany(msgBuffer, indexName, bulkParms);
+					msgBuffer.Clear();
+
+					Interlocked.Add(ref NumSent, bufferSize);
+
+					// Output how many messages sent so far
+					if (NumSent % 10000 == 0)
+					{
+						Console.WriteLine("Sent {0:0,0} messages over Thrift", NumSent);
+					}
+				}
+			}
+		}
     }
 }

src/ProtocolLoadTest/ThriftTester.cs

@@ -8,11 +8,11 @@ namespace ProtocolLoadTest
 {
     internal class ThriftTester : Tester, ITester
     {
-        // Number of messages sent by all ThriftTester instances
-        private static int NumSent;
+        
 
         public void Run(string indexName, int port, int numMessages, int bufferSize)
         {
+			// refresh == false is default on elasticsearch's side.
             var bulkParms = new SimpleBulkParameters() { Refresh = false };
 
             var settings = new ConnectionSettings("localhost", port)
@@ -22,29 +22,9 @@ public void Run(string indexName, int port, int numMessages, int bufferSize)
 
             Connect(client, settings);
 
-            IList<Message> msgBuffer = new List<Message>(bufferSize);
-
-            var msgGenerator = new MessageGenerator();
-
-            foreach (var msg in msgGenerator.Generate(numMessages))
-            {
-                msgBuffer.Add(msg);
-
-                // Flush buffer once max size reached
-                if (msgBuffer.Count >= bufferSize)
-                {
-                    client.IndexMany(msgBuffer, indexName, bulkParms);
-                    msgBuffer.Clear();
-
-                    Interlocked.Add(ref NumSent, bufferSize);
-
-                    // Output how many messages sent so far
-                    if (NumSent % 10000 == 0)
-                    {
-                        Console.WriteLine("Sent {0:0,0} messages over Thrift", NumSent);
-                    }
-                }
-            }
+			GenerateAndIndex(indexName, numMessages, bufferSize, bulkParms, client);
         }
+
+		
     }
 }