Merge pull request #43 from espertechinc/hotfix-thread-local-usage

Fixes instance creation when thread local tied to thread pool

.circleci/config.yml

@@ -12,6 +12,6 @@ jobs:
       - run: dotnet restore NEsperAll.sln
       - run: msbuild NEsper.proj
       - store_artifacts:
-          path: build/NEsper-8.5.5.zip
+          path: build/NEsper-8.5.6.zip
       - store_artifacts:
           path: build/packages

Directory.Build.props

@@ -18,7 +18,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.5</VersionPrefix>
+		<VersionPrefix Condition="'$(VersionPrefix)' == ''">8.5.6</VersionPrefix>
 		<VersionSuffix Condition="'$(VersionSuffix)' == ''"></VersionSuffix>
 	</PropertyGroup>
 

NEsper.Documentation/NEsper.Documentation.shfbproj

@@ -16,7 +16,7 @@
     <Name>NEsper.Documentation</Name>
     <!-- SHFB properties -->
     <FrameworkVersion>.NET Framework 4.6.2</FrameworkVersion>
-    <OutputPath>..\build\NEsper-8.5.5\docs\</OutputPath>
+    <OutputPath>..\build\NEsper-8.5.6\docs\</OutputPath>
     <HtmlHelpName>NEsper</HtmlHelpName>
     <Language>en-US</Language>
     <TransformComponentArguments>

NEsper.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>NEsper</id>
-    <version>8.5.5</version>
+    <version>8.5.6</version>
     <authors>EsperTech</authors>
     <owners>EsperTech</owners>
     <language>en-us</language>
@@ -27,7 +27,7 @@
   </metadata>
 
   <files>
-    <file src="build\NEsper-8.5.5\lib\**" target="lib\{framework name}[{version}]" />
+    <file src="build\NEsper-8.5.6\lib\**" target="lib\{framework name}[{version}]" />
   </files>
 </package>
 

NEsper.proj

@@ -8,7 +8,7 @@
     <SolutionDir>$(MSBuildProjectDirectory)</SolutionDir>
     <!-- Distribution version -->
     <Version Condition=" '$(CCNetLabel)' != '' ">$(CCNetLabel)</Version>
-    <Version Condition=" '$(Version)' == '' ">8.5.5</Version>
+    <Version Condition=" '$(Version)' == '' ">8.5.6</Version>
 
     <!-- Build Directories -->
     <BuildPath>$(MSBuildProjectDirectory)\build</BuildPath>

buildspec.yml

@@ -4,7 +4,7 @@ env:
   variables:
     MASTER_PROJECT: .\NEsper.proj
     PACKAGE_DIRECTORY: .\packages
-    VERSION: 8.5.5
+    VERSION: 8.5.6
 
 phases:
   build:

src/NEsper.Common/common/internal/epl/historical/common/HistoricalEventViewableFactoryBase.cs

@@ -37,7 +37,7 @@ static HistoricalEventViewableFactoryBase()
         }
 
         public IThreadLocal<HistoricalDataCache> DataCacheThreadLocal { get; } =
-            new SlimThreadLocal<HistoricalDataCache>(() => null);
+            new SystemThreadLocal<HistoricalDataCache>(() => null);
 
         public abstract void Ready(
             StatementContext statementContext,

src/NEsper.Common/common/internal/epl/variable/core/VariableVersionThreadLocal.cs

@@ -36,7 +36,7 @@ public VariableVersionThreadLocal(IThreadLocalManager threadLocalManager)
         /// Initializes a new instance of the <see cref="VariableVersionThreadLocal"/> class.
         /// </summary>
         public VariableVersionThreadLocal()
-            : this(new DefaultThreadLocalManager(new SlimThreadLocalFactory()))
+            : this(new DefaultThreadLocalManager(new SystemThreadLocalFactory()))
         {
         }
 

src/NEsper.Common/common/internal/filterspec/ExprNodeAdapterMSPlain.cs

@@ -34,7 +34,7 @@ public ExprNodeAdapterMSPlain(
         {
             _variableService = variableService;
 
-            _arrayPerThread = new SlimThreadLocal<EventBean[]>(
+            _arrayPerThread = new SystemThreadLocal<EventBean[]>(
                 () => {
                     var eventsPerStream = new EventBean[prototypeArray.Length];
                     Array.Copy(prototypeArray, 0, eventsPerStream, 0, prototypeArray.Length);

src/NEsper.Common/common/internal/statement/dispatch/DispatchService.cs

@@ -23,13 +23,13 @@ public class DispatchService
         private static readonly ILog Log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
         private readonly IThreadLocal<ArrayDeque<Dispatchable>> dispatchStateThreadLocal =
-            new SlimThreadLocal<ArrayDeque<Dispatchable>>(() => new ArrayDeque<Dispatchable>());
+            new SystemThreadLocal<ArrayDeque<Dispatchable>>(() => new ArrayDeque<Dispatchable>());
 
         public IThreadLocal<ArrayDeque<Dispatchable>> DispatchStateThreadLocal => dispatchStateThreadLocal;
 
         public void Dispatch()
         {
-            DispatchFromQueue(dispatchStateThreadLocal.GetOrCreate());
+            DispatchFromQueue(dispatchStateThreadLocal.Value);
         }
 
         public void AddExternal(Dispatchable dispatchable)
@@ -45,16 +45,18 @@ private static void AddToQueue(
             dispatchQueue.Add(dispatchable);
         }
 
-        private static void DispatchFromQueue(ArrayDeque<Dispatchable> dispatchQueue)
+        private static void DispatchFromQueue(Deque<Dispatchable> dispatchQueue)
         {
-            using (new Tracer(Log, "DispatchFromQueue")) {
-                while (true) {
-                    var next = dispatchQueue.Poll();
-                    if (next == null) {
-                        break;
-                    }
+            if (dispatchQueue != null) {
+                using (new Tracer(Log, "DispatchFromQueue")) {
+                    while (true) {
+                        var next = dispatchQueue.Poll();
+                        if (next == null) {
+                            break;
+                        }
 
-                    next.Execute();
+                        next.Execute();
+                    }
                 }
             }
         }

src/NEsper.Common/common/internal/view/intersect/IntersectViewFactory.cs

@@ -61,21 +61,19 @@ public void Init(
             }
 
             if (_batchViewIndex != -1) {
-                _batchViewLocalState = new SlimThreadLocal<IntersectBatchViewLocalState>(
+                _batchViewLocalState = new SystemThreadLocal<IntersectBatchViewLocalState>(
                     () =>
                         new IntersectBatchViewLocalState(
                             new EventBean[_intersecteds.Length][],
                             new EventBean[_intersecteds.Length][]));
             }
             else if (_hasAsymetric) {
-                _asymetricViewLocalState = new SlimThreadLocal<IntersectAsymetricViewLocalState>(
-                    () =>
-                        new IntersectAsymetricViewLocalState(new EventBean[_intersecteds.Length][]));
+                _asymetricViewLocalState = new SystemThreadLocal<IntersectAsymetricViewLocalState>(
+                    () => new IntersectAsymetricViewLocalState(new EventBean[_intersecteds.Length][]));
             }
             else {
-                _defaultViewLocalState = new SlimThreadLocal<IntersectDefaultViewLocalState>(
-                    () =>
-                        new IntersectDefaultViewLocalState(new EventBean[_intersecteds.Length][]));
+                _defaultViewLocalState = new SystemThreadLocal<IntersectDefaultViewLocalState>(
+                    () => new IntersectDefaultViewLocalState(new EventBean[_intersecteds.Length][]));
             }
         }
 

src/NEsper.Compiler/internal/util/CompilerVersion.cs

@@ -10,6 +10,6 @@ namespace com.espertech.esper.compiler.@internal.util
 {
     public class CompilerVersion
     {
-        public const string COMPILER_VERSION = "8.5.5";
+        public const string COMPILER_VERSION = "8.5.6";
     }
 } // end of namespace

src/NEsper.Compiler/internal/util/Version.cs

@@ -11,7 +11,7 @@ namespace com.espertech.esper.compiler.@internal.util
     public class Version
     {
         public static string COMPILER_VERSION {
-            get => "8.5.5";
+            get => "8.5.6";
         }
     }
 } // end of namespace

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseListener.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarBaseVisitor.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarLexer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarListener.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarParser.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Grammar/internal/generated/EsperEPL2GrammarVisitor.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-// Generated from C:\Src\Espertech\NEsper-8.5.5\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
+// Generated from C:\Src\Espertech\NEsper-8.5.6\NEsper\grammar\EsperEPL2Grammar.g4 by ANTLR 4.7.1
 
 // Unreachable code detected
 #pragma warning disable 0162

src/NEsper.Runtime/client/util/RuntimeVersion.cs

@@ -19,7 +19,7 @@ public class RuntimeVersion
         /// <summary>
         ///     Current runtime version.
         /// </summary>
-        public const string RUNTIME_VERSION = "8.5.5";
+        public const string RUNTIME_VERSION = "8.5.6";
 
         /// <summary>
         ///     Current runtime major version.

src/NEsper.Runtime/internal/kernel/service/StatementResultServiceImpl.cs

@@ -69,7 +69,7 @@ public StatementResultServiceImpl(
             StatementInformationalsRuntime statementInformationals,
             EPServicesContext epServicesContext)
         {
-            StatementDispatchTl = new SlimThreadLocal<StatementDispatchTLEntry>(() => new StatementDispatchTLEntry());
+            StatementDispatchTl = new SystemThreadLocal<StatementDispatchTLEntry>(() => new StatementDispatchTLEntry());
             _statementInformationals = statementInformationals;
             _epServicesContext = epServicesContext;
             _outboundThreading = epServicesContext.ThreadingService.IsOutboundThreading;
@@ -253,7 +253,10 @@ public void ProcessDispatch(UniformPair<EventBean[]> events)
 
         public void ClearDeliveriesRemoveStream(EventBean[] removedEvents)
         {
-            var entry = DispatchTL.GetOrCreate();
+            var entry = DispatchTL.Value;
+            if (entry == null) {
+                return;
+            }
 
             entry.Results.RemoveWhere(
                 pair => {

src/NEsper.Runtime/internal/metrics/codahale_metrics/metrics/stats/ThreadLocalRandom.cs

@@ -26,7 +26,7 @@ internal class ThreadLocalRandom
         ///     The actual ThreadLocal
         /// </summary>
         private static readonly IThreadLocal<ThreadLocalRandom> LOCAL_RANDOM_THREAD_LOCAL =
-            new SlimThreadLocal<ThreadLocalRandom>(() => new ThreadLocalRandom());
+            new SystemThreadLocal<ThreadLocalRandom>(() => new ThreadLocalRandom());
 
         /// <summary>
         ///     Initialization flag to permit calls to setSeed to succeed only while executing the Random

src/NEsper.Runtime/internal/namedwindow/NamedWindowDispatchServiceImpl.cs

@@ -8,6 +8,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 
 using com.espertech.esper.common.client;
 using com.espertech.esper.common.client.hook.exception;
@@ -41,7 +42,7 @@ public class NamedWindowDispatchServiceImpl : NamedWindowDispatchService
         private readonly VariableManagementService variableService;
 
         private readonly IThreadLocal<DispatchesTL> threadLocal = 
-            new SlimThreadLocal<DispatchesTL>(() => new DispatchesTL());
+            new SystemThreadLocal<DispatchesTL>(() => new DispatchesTL());
 
         public NamedWindowDispatchServiceImpl(
             SchedulingService schedulingService,
@@ -77,8 +78,8 @@ public void AddDispatch(
 
         public bool Dispatch()
         {
-            var dispatchesTL = threadLocal.GetOrCreate();
-            if (dispatchesTL.Dispatches.IsEmpty()) {
+            var dispatchesTL = threadLocal.Value;
+            if (dispatchesTL == null || dispatchesTL.Dispatches.IsEmpty()) {
                 return false;
             }
 
@@ -94,6 +95,7 @@ public bool Dispatch()
                         dispatchesTL.Current.AddAll(dispatchesTL.Dispatches);
                         dispatchesTL.Dispatches.Clear();
                         ProcessDispatches(dispatchesTL.Current, dispatchesTL.Work, dispatchesTL.DispatchesPerStmt);
+                        Console.WriteLine("{0}", dispatchesTL.Current.Count);
                     }
                     catch (EPException) {
                         throw;
@@ -427,11 +429,13 @@ public LinkedHashMap<NamedWindowConsumerView, NamedWindowDeltaData> GetDeltaPerC
 
         private class DispatchesTL
         {
-            public ArrayDeque<NamedWindowConsumerLatch> Dispatches { get; } = new ArrayDeque<NamedWindowConsumerLatch>();
+            private const int DefaultDequeSize = 16;
+
+            public ArrayDeque<NamedWindowConsumerLatch> Dispatches { get; } = new ArrayDeque<NamedWindowConsumerLatch>(DefaultDequeSize);
 
-            public ArrayDeque<NamedWindowConsumerLatch> Current { get; } = new ArrayDeque<NamedWindowConsumerLatch>();
+            public ArrayDeque<NamedWindowConsumerLatch> Current { get; } = new ArrayDeque<NamedWindowConsumerLatch>(DefaultDequeSize);
 
-            public ArrayDeque<NamedWindowConsumerLatch> Work { get; } = new ArrayDeque<NamedWindowConsumerLatch>();
+            public ArrayDeque<NamedWindowConsumerLatch> Work { get; } = new ArrayDeque<NamedWindowConsumerLatch>(DefaultDequeSize);
 
             public IDictionary<EPStatementAgentInstanceHandle, object> DispatchesPerStmt { get; } =
                 new Dictionary<EPStatementAgentInstanceHandle, object>();

tst/NEsper.Regression/suite/client/deploy/ClientDeployVersion.cs

@@ -37,7 +37,7 @@ public void Run(RegressionEnvironment env)
 				EPCompiled compiled = EPCompiledIOUtil.Read(new File(file));
 
 				var versionMismatchMsg =
-					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.5 and the compiler version of the compiled unit is 8.0.0";
+					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.6 and the compiler version of the compiled unit is 8.0.0";
 				AssertMessage(
 					Assert.Throws<EPDeployDeploymentVersionException>(
 						() => env.Runtime.DeploymentService.Deploy(compiled)),
@@ -51,7 +51,7 @@ public void Run(RegressionEnvironment env)
 				AssertMessage(
 					Assert.Throws<EPException>(
 						() => env.Runtime.FireAndForgetService.ExecuteQuery(compiled)),
-					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.5 and the compiler version of the compiled unit is 8.0.0");
+					"Major or minor version of compiler and runtime mismatch; The runtime version is 8.5.6 and the compiler version of the compiled unit is 8.0.0");
 #endif
 			}
 		}