优化代码，修复bug，完善日志输出。

tangxuehua · tangxuehua · commit db966d7e7ca9 · 2015-10-20T00:23:32.000+08:00
diff --git a/src/EQueue.AdminWeb/EQueue.AdminWeb.csproj b/src/EQueue.AdminWeb/EQueue.AdminWeb.csproj
@@ -49,9 +49,9 @@
     <Reference Include="Autofac.Integration.Mvc">
       <HintPath>..\packages\Autofac.Mvc5.3.3.0\lib\net45\Autofac.Integration.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="ECommon, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ECommon, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ECommon.1.5.2\lib\net45\ECommon.dll</HintPath>
+      <HintPath>..\packages\ECommon.1.5.3\lib\net45\ECommon.dll</HintPath>
     </Reference>
     <Reference Include="ECommon.Autofac, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -244,4 +244,4 @@
   </Target>
   <Target Name="AfterBuild">
   </Target> -->
-</Project>
+</Project>
diff --git a/src/EQueue.AdminWeb/Web.config b/src/EQueue.AdminWeb/Web.config
@@ -44,4 +44,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/src/EQueue.AdminWeb/packages.config b/src/EQueue.AdminWeb/packages.config
@@ -4,7 +4,7 @@
   <package id="Autofac" version="3.4.0" targetFramework="net45" />
   <package id="Autofac.Mvc5" version="3.3.0" targetFramework="net45" />
   <package id="bootstrap" version="3.0.0" targetFramework="net45" />
-  <package id="ECommon" version="1.5.2" targetFramework="net45" />
+  <package id="ECommon" version="1.5.3" targetFramework="net45" />
   <package id="ECommon.Autofac" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.JsonNet" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.Log4Net" version="1.4.2" targetFramework="net45" />
@@ -19,4 +19,4 @@
   <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
   <package id="Respond" version="1.2.0" targetFramework="net45" />
   <package id="WebGrease" version="1.5.2" targetFramework="net45" />
-</packages>
+</packages>
diff --git a/src/EQueue/Broker/Client/ConsumerManager.cs b/src/EQueue/Broker/Client/ConsumerManager.cs
@@ -11,12 +11,10 @@ public class ConsumerManager
     {
         private readonly ConcurrentDictionary<string, ConsumerGroup> _consumerGroupDict = new ConcurrentDictionary<string, ConsumerGroup>();
         private readonly IScheduleService _scheduleService;
-        private readonly ILogger _logger;
 
         public ConsumerManager()
         {
             _scheduleService = ObjectContainer.Resolve<IScheduleService>();
-            _logger = ObjectContainer.Resolve<ILoggerFactory>().Create(GetType().FullName);
         }
 
         public void Start()
diff --git a/src/EQueue/Broker/DefaultMessageStore.cs b/src/EQueue/Broker/DefaultMessageStore.cs
@@ -111,7 +111,11 @@ private void DeleteMessages()
             {
                 if (_chunkManager.RemoveChunk(chunk))
                 {
-                    _logger.InfoFormat("Message chunk {0} is deleted.", chunk);
+                    _logger.InfoFormat("Message chunk #{0} is deleted, chunkPositionScale: [{1}, {2}], minConsumedMessagePosition: {3}",
+                        chunk.ChunkHeader.ChunkNumber,
+                        chunk.ChunkHeader.ChunkDataStartPosition,
+                        chunk.ChunkHeader.ChunkDataEndPosition,
+                        _minConsumedMessagePosition);
                 }
             }
         }
diff --git a/src/EQueue/Broker/DefaultQueueStore.cs b/src/EQueue/Broker/DefaultQueueStore.cs
@@ -111,7 +111,7 @@ public long GetMinConusmedMessagePosition()
 
             if (queue != null && minConsumedQueueOffset >= 0)
             {
-                return queue.GetMessagePosition(minConsumedQueueOffset);
+                return queue.GetMessagePosition(minConsumedQueueOffset, false);
             }
 
             return -1L;
@@ -350,15 +350,16 @@ private void DeleteQueueMessages()
             {
                 try
                 {
-                    foreach (var queue in _queueDict.Values)
+                    var queues = _queueDict.OrderBy(x => x.Key).Select(x => x.Value).ToList();
+                    foreach (var queue in queues)
                     {
                         try
                         {
                             queue.DeleteMessages(_messageStore.MinMessagePosition);
                         }
                         catch (Exception ex)
                         {
-                            _logger.Error(string.Format("Delete queue messages has exception, topic: {0}, queueId: {1}", queue.Topic, queue.QueueId), ex);
+                            _logger.Error(string.Format("Delete queue (topic: {0}, queueId: {1}) messages has exception.", queue.Topic, queue.QueueId), ex);
                         }
                     }
                 }
diff --git a/src/EQueue/Broker/Queue.cs b/src/EQueue/Broker/Queue.cs
@@ -70,10 +70,10 @@ public void AddMessage(long messagePosition)
         {
             _chunkWriter.Write(new QueueLogRecord(messagePosition + 1));
         }
-        public long GetMessagePosition(long queueOffset)
+        public long GetMessagePosition(long queueOffset, bool autoCache = true)
         {
             var position = queueOffset * _chunkManager.Config.ChunkDataUnitSize;
-            var record = _chunkReader.TryReadAt(position, ReadMessageIndex);
+            var record = _chunkReader.TryReadAt(position, ReadMessageIndex, autoCache);
             if (record == null)
             {
                 return -1L;
@@ -106,23 +106,22 @@ public long GetMinQueueOffset()
         }
         public void DeleteMessages(long minMessagePosition)
         {
-            var chunks = _chunkManager.GetAllChunks().Where(x => x.IsCompleted);
+            var chunks = _chunkManager.GetAllChunks().Where(x => x.IsCompleted).OrderBy(x => x.ChunkHeader.ChunkNumber);
 
             foreach (var chunk in chunks)
             {
                 var maxPosition = chunk.ChunkHeader.ChunkDataEndPosition - _chunkManager.Config.ChunkDataUnitSize;
-                var record = _chunkReader.TryReadAt(maxPosition, ReadMessageIndex);
+                var record = _chunkReader.TryReadAt(maxPosition, ReadMessageIndex, false);
                 if (record == null)
                 {
                     continue;
                 }
                 var chunkLastMessagePosition = record.MessageLogPosition - 1;
-
                 if (chunkLastMessagePosition < minMessagePosition)
                 {
                     if (_chunkManager.RemoveChunk(chunk))
                     {
-                        _logger.InfoFormat("Queue chunk {0} is deleted, chunk last message position: {1}", chunk, chunkLastMessagePosition);
+                        _logger.InfoFormat("Queue (topic: {0}, queueId: {1}) chunk #{2} is deleted, chunkLastMessagePosition: {3}, messageStoreMinMessagePosition: {4}", Topic, QueueId, chunk.ChunkHeader.ChunkNumber, chunkLastMessagePosition, minMessagePosition);
                     }
                 }
             }
diff --git a/src/EQueue/Broker/Storage/Chunk.cs b/src/EQueue/Broker/Storage/Chunk.cs
@@ -284,10 +284,6 @@ private void InitNew(int chunkNumber)
                         try
                         {
                             _memoryChunk = Chunk.CreateNew(_filename, chunkNumber, _chunkManager, _chunkConfig, true);
-                            if (_logger.IsDebugEnabled)
-                            {
-                                _logger.DebugFormat("Cached new chunk {0} to memory.", this);
-                            }
                         }
                         catch (OutOfMemoryException)
                         {
@@ -403,10 +399,6 @@ private void InitOngoing<T>(Func<byte[], T> readRecordFunc) where T : ILogRecord
                     try
                     {
                         _memoryChunk = Chunk.FromOngoingFile<T>(_filename, _chunkManager, _chunkConfig, readRecordFunc, true);
-                        if (_logger.IsDebugEnabled)
-                        {
-                            _logger.DebugFormat("Cached ongoing chunk {0} to memory.", this);
-                        }
                     }
                     catch (OutOfMemoryException)
                     {
@@ -454,10 +446,6 @@ public bool TryCacheInMemory(bool shouldCacheNextChunk)
                         return false;
                     }
                     _memoryChunk = Chunk.FromCompletedFile(_filename, _chunkManager, _chunkConfig, true);
-                    if (_logger.IsDebugEnabled)
-                    {
-                        _logger.DebugFormat("Cached completed chunk {0} to memory.", this);
-                    }
                     if (shouldCacheNextChunk)
                     {
                         Task.Factory.StartNew(() => _chunkManager.TryCacheNextChunk(this));
@@ -490,10 +478,6 @@ public bool UnCacheFromMemory()
                     var memoryChunk = _memoryChunk;
                     _memoryChunk = null;
                     memoryChunk.Dispose();
-                    if (_logger.IsDebugEnabled)
-                    {
-                        _logger.DebugFormat("Uncached completed chunk {0} from memory.", this);
-                    }
                     return true;
                 }
                 catch (Exception ex)
@@ -503,7 +487,7 @@ public bool UnCacheFromMemory()
                 }
             }
         }
-        public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T : class, ILogRecord
+        public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord
         {
             if (_isDestroying)
             {
@@ -512,8 +496,6 @@ public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T
 
             _lastActiveTime = DateTime.Now;
 
-            _chunkManager.TryCacheNextChunk(this);
-
             if (!_isMemoryChunk)
             {
                 if (_cacheItems != null)
@@ -544,7 +526,7 @@ public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T
                 }
             }
 
-            if (!_isMemoryChunk && _isCompleted && Interlocked.CompareExchange(ref _cachingChunk, 1, 0) == 0)
+            if (autoCache && !_isMemoryChunk && _isCompleted && Interlocked.CompareExchange(ref _cachingChunk, 1, 0) == 0)
             {
                 Task.Factory.StartNew(() => TryCacheInMemory(true));
             }
@@ -1229,9 +1211,8 @@ private void PrintReadStatus()
                 var cacheReadThroughput = cacheItemReadCount - _previousCacheReadCount;
                 _previousCacheReadCount = cacheItemReadCount;
 
-                _logger.DebugFormat("Read status: chunk: {0}, currentTime: {1}, fileRead: {2}/s, unmanagedRead: {3}/s, cacheRead: {4}/s",
-                    this,
-                    DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"),
+                _logger.DebugFormat("Read status: chunkNum: #{0}, fileRead: {1}/s, unmanagedRead: {2}/s, cacheRead: {3}/s",
+                    ChunkHeader.ChunkNumber,
                     fileReadThroughput,
                     unmanagedReadThroughput,
                     cacheReadThroughput);
diff --git a/src/EQueue/Broker/Storage/ChunkReader.cs b/src/EQueue/Broker/Storage/ChunkReader.cs
@@ -19,7 +19,7 @@ public ChunkReader(ChunkManager chunkManager, ChunkWriter chunkWriter)
             _chunkWriter = chunkWriter;
         }
 
-        public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc) where T : class, ILogRecord
+        public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord
         {
             var lastChunk = _chunkWriter.CurrentChunk;
             var maxPosition = lastChunk.GlobalDataPosition;
@@ -38,7 +38,7 @@ public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc) where T : c
             }
 
             var localPosition = chunk.ChunkHeader.GetLocalDataPosition(position);
-            return chunk.TryReadAt(localPosition, readRecordFunc);
+            return chunk.TryReadAt(localPosition, readRecordFunc, autoCache);
         }
         public BufferLogRecord TryReadRecordBufferAt(long position)
         {
diff --git a/src/EQueue/EQueue.csproj b/src/EQueue/EQueue.csproj
@@ -42,9 +42,9 @@
     <Reference Include="Dapper">
       <HintPath>..\packages\Dapper.1.38\lib\net45\Dapper.dll</HintPath>
     </Reference>
-    <Reference Include="ECommon, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ECommon, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\ecommon.1.5.2\lib\net45\ECommon.dll</HintPath>
+      <HintPath>..\packages\ecommon.1.5.3\lib\net45\ECommon.dll</HintPath>
     </Reference>
     <Reference Include="ECommon.Dapper, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/EQueue/packages.config b/src/EQueue/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Dapper" version="1.38" targetFramework="net45" />
-  <package id="ECommon" version="1.5.2" targetFramework="net45" />
+  <package id="ECommon" version="1.5.3" targetFramework="net45" />
   <package id="ECommon.Dapper" version="1.4.2" targetFramework="net45" />
 </packages>
diff --git a/src/Samples/QuickStart/QuickStart.BrokerServer/QuickStart.BrokerServer.csproj b/src/Samples/QuickStart/QuickStart.BrokerServer/QuickStart.BrokerServer.csproj
@@ -44,9 +44,9 @@
     <Reference Include="Dapper">
       <HintPath>..\..\..\packages\Dapper.1.38\lib\net45\Dapper.dll</HintPath>
     </Reference>
-    <Reference Include="ECommon, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ECommon, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\ECommon.1.5.2\lib\net45\ECommon.dll</HintPath>
+      <HintPath>..\..\..\packages\ECommon.1.5.3\lib\net45\ECommon.dll</HintPath>
     </Reference>
     <Reference Include="ECommon.Autofac, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Samples/QuickStart/QuickStart.BrokerServer/log4net.config b/src/Samples/QuickStart/QuickStart.BrokerServer/log4net.config
@@ -21,6 +21,10 @@
     <appender-ref ref="console"/>
     <appender-ref ref="rollingFile"/>
   </logger>
+  <logger name="EQueue.Broker.Client.ConsumerGroup" additivity="false">
+    <level value="INFO" />
+    <appender-ref ref="rollingFile"/>
+  </logger>
   <root>
     <!--all priority options： OFF、FATAL、ERROR, WARN, INFO, DEBUG, ALL-->
     <priority value="INFO"/>
diff --git a/src/Samples/QuickStart/QuickStart.BrokerServer/packages.config b/src/Samples/QuickStart/QuickStart.BrokerServer/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Autofac" version="3.4.0" targetFramework="net40" />
   <package id="Dapper" version="1.38" targetFramework="net45" />
-  <package id="ECommon" version="1.5.2" targetFramework="net45" />
+  <package id="ECommon" version="1.5.3" targetFramework="net45" />
   <package id="ECommon.Autofac" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.Dapper" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.JsonNet" version="1.4.2" targetFramework="net45" />
diff --git a/src/Samples/QuickStart/QuickStart.ConsumerClient/Program.cs b/src/Samples/QuickStart/QuickStart.ConsumerClient/Program.cs
@@ -78,7 +78,7 @@ private void PrintThroughput()
                 var totalCountOfCurrentPeriod = totalHandledCount - _previusHandledCount;
                 _previusHandledCount = totalHandledCount;
 
-                _logger.InfoFormat("currentTime: {0}, totalReceived: {1}, throughput: {2}/s", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), totalHandledCount, totalCountOfCurrentPeriod);
+                _logger.InfoFormat("totalReceived: {0}, throughput: {1}/s", totalHandledCount, totalCountOfCurrentPeriod);
             }
         }
     }
diff --git a/src/Samples/QuickStart/QuickStart.ConsumerClient/QuickStart.ConsumerClient.csproj b/src/Samples/QuickStart/QuickStart.ConsumerClient/QuickStart.ConsumerClient.csproj
@@ -41,9 +41,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Autofac.3.4.0\lib\net40\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="ECommon, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ECommon, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\ECommon.1.5.2\lib\net45\ECommon.dll</HintPath>
+      <HintPath>..\..\..\packages\ECommon.1.5.3\lib\net45\ECommon.dll</HintPath>
     </Reference>
     <Reference Include="ECommon.Autofac, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Samples/QuickStart/QuickStart.ConsumerClient/log4net.config b/src/Samples/QuickStart/QuickStart.ConsumerClient/log4net.config
@@ -12,7 +12,7 @@
   </appender>
   <appender name="console" type="log4net.Appender.ConsoleAppender">
     <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%logger - %message%newline" />
+      <conversionPattern value="%date %5level %logger - %message%newline" />
     </layout>
   </appender>
   <root>
diff --git a/src/Samples/QuickStart/QuickStart.ConsumerClient/packages.config b/src/Samples/QuickStart/QuickStart.ConsumerClient/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.4.0" targetFramework="net40" />
-  <package id="ECommon" version="1.5.2" targetFramework="net45" />
+  <package id="ECommon" version="1.5.3" targetFramework="net45" />
   <package id="ECommon.Autofac" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.JsonNet" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.Log4Net" version="1.4.2" targetFramework="net45" />
diff --git a/src/Samples/QuickStart/QuickStart.ProducerClient/Program.cs b/src/Samples/QuickStart/QuickStart.ProducerClient/Program.cs
@@ -164,7 +164,7 @@ static void PrintThroughput()
             var totalCountOfCurrentPeriod = totalSentCount - _previousSentCount;
             _previousSentCount = totalSentCount;
 
-            _logger.InfoFormat("Send message mode: {0}, currentTime: {1}, totalSent: {2}, throughput: {3}/s", _mode, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"), totalSentCount, totalCountOfCurrentPeriod);
+            _logger.InfoFormat("Send message mode: {0}, totalSent: {1}, throughput: {2}/s", _mode, totalSentCount, totalCountOfCurrentPeriod);
         }
 
         class ResponseHandler : IResponseHandler
diff --git a/src/Samples/QuickStart/QuickStart.ProducerClient/QuickStart.ProducerClient.csproj b/src/Samples/QuickStart/QuickStart.ProducerClient/QuickStart.ProducerClient.csproj
@@ -44,9 +44,9 @@
     <Reference Include="Dapper">
       <HintPath>..\..\..\packages\Dapper.1.38\lib\net45\Dapper.dll</HintPath>
     </Reference>
-    <Reference Include="ECommon, Version=1.5.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="ECommon, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\ECommon.1.5.2\lib\net45\ECommon.dll</HintPath>
+      <HintPath>..\..\..\packages\ECommon.1.5.3\lib\net45\ECommon.dll</HintPath>
     </Reference>
     <Reference Include="ECommon.Autofac, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Samples/QuickStart/QuickStart.ProducerClient/log4net.config b/src/Samples/QuickStart/QuickStart.ProducerClient/log4net.config
@@ -12,7 +12,7 @@
   </appender>
   <appender name="console" type="log4net.Appender.ConsoleAppender">
     <layout type="log4net.Layout.PatternLayout">
-      <conversionPattern value="%logger - %message%newline" />
+      <conversionPattern value="%date %5level %logger - %message%newline" />
     </layout>
   </appender>
   <root>
diff --git a/src/Samples/QuickStart/QuickStart.ProducerClient/packages.config b/src/Samples/QuickStart/QuickStart.ProducerClient/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Autofac" version="3.4.0" targetFramework="net40" />
   <package id="Dapper" version="1.38" targetFramework="net45" />
-  <package id="ECommon" version="1.5.2" targetFramework="net45" />
+  <package id="ECommon" version="1.5.3" targetFramework="net45" />
   <package id="ECommon.Autofac" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.JsonNet" version="1.4.2" targetFramework="net45" />
   <package id="ECommon.Log4Net" version="1.4.2" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,10 @@ public class ConsumerManager`
`11`	`11`	`{`
`12`	`12`	`private readonly ConcurrentDictionary<string, ConsumerGroup> _consumerGroupDict = new ConcurrentDictionary<string, ConsumerGroup>();`
`13`	`13`	`private readonly IScheduleService _scheduleService;`
`14`		`- private readonly ILogger _logger;`
`15`	`14`
`16`	`15`	`public ConsumerManager()`
`17`	`16`	`{`
`18`	`17`	`_scheduleService = ObjectContainer.Resolve<IScheduleService>();`
`19`		`- _logger = ObjectContainer.Resolve<ILoggerFactory>().Create(GetType().FullName);`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`public void Start()`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,11 @@ private void DeleteMessages()`
`111`	`111`	`{`
`112`	`112`	`if (_chunkManager.RemoveChunk(chunk))`
`113`	`113`	`{`
`114`		`- _logger.InfoFormat("Message chunk {0} is deleted.", chunk);`
	`114`	`+ _logger.InfoFormat("Message chunk #{0} is deleted, chunkPositionScale: [{1}, {2}], minConsumedMessagePosition: {3}",`
	`115`	`+ chunk.ChunkHeader.ChunkNumber,`
	`116`	`+ chunk.ChunkHeader.ChunkDataStartPosition,`
	`117`	`+ chunk.ChunkHeader.ChunkDataEndPosition,`
	`118`	`+ _minConsumedMessagePosition);`
`115`	`119`	`}`
`116`	`120`	`}`
`117`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public long GetMinConusmedMessagePosition()`
`111`	`111`
`112`	`112`	`if (queue != null && minConsumedQueueOffset >= 0)`
`113`	`113`	`{`
`114`		`- return queue.GetMessagePosition(minConsumedQueueOffset);`
	`114`	`+ return queue.GetMessagePosition(minConsumedQueueOffset, false);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`return -1L;`
`@@ -350,15 +350,16 @@ private void DeleteQueueMessages()`
`350`	`350`	`{`
`351`	`351`	`try`
`352`	`352`	`{`
`353`		`- foreach (var queue in _queueDict.Values)`
	`353`	`+ var queues = _queueDict.OrderBy(x => x.Key).Select(x => x.Value).ToList();`
	`354`	`+ foreach (var queue in queues)`
`354`	`355`	`{`
`355`	`356`	`try`
`356`	`357`	`{`
`357`	`358`	`queue.DeleteMessages(_messageStore.MinMessagePosition);`
`358`	`359`	`}`
`359`	`360`	`catch (Exception ex)`
`360`	`361`	`{`
`361`		`- _logger.Error(string.Format("Delete queue messages has exception, topic: {0}, queueId: {1}", queue.Topic, queue.QueueId), ex);`
	`362`	`+ _logger.Error(string.Format("Delete queue (topic: {0}, queueId: {1}) messages has exception.", queue.Topic, queue.QueueId), ex);`
`362`	`363`	`}`
`363`	`364`	`}`
`364`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@ public void AddMessage(long messagePosition)`
`70`	`70`	`{`
`71`	`71`	`_chunkWriter.Write(new QueueLogRecord(messagePosition + 1));`
`72`	`72`	`}`
`73`		`- public long GetMessagePosition(long queueOffset)`
	`73`	`+ public long GetMessagePosition(long queueOffset, bool autoCache = true)`
`74`	`74`	`{`
`75`	`75`	`var position = queueOffset * _chunkManager.Config.ChunkDataUnitSize;`
`76`		`- var record = _chunkReader.TryReadAt(position, ReadMessageIndex);`
	`76`	`+ var record = _chunkReader.TryReadAt(position, ReadMessageIndex, autoCache);`
`77`	`77`	`if (record == null)`
`78`	`78`	`{`
`79`	`79`	`return -1L;`
`@@ -106,23 +106,22 @@ public long GetMinQueueOffset()`
`106`	`106`	`}`
`107`	`107`	`public void DeleteMessages(long minMessagePosition)`
`108`	`108`	`{`
`109`		`- var chunks = _chunkManager.GetAllChunks().Where(x => x.IsCompleted);`
	`109`	`+ var chunks = _chunkManager.GetAllChunks().Where(x => x.IsCompleted).OrderBy(x => x.ChunkHeader.ChunkNumber);`
`110`	`110`
`111`	`111`	`foreach (var chunk in chunks)`
`112`	`112`	`{`
`113`	`113`	`var maxPosition = chunk.ChunkHeader.ChunkDataEndPosition - _chunkManager.Config.ChunkDataUnitSize;`
`114`		`- var record = _chunkReader.TryReadAt(maxPosition, ReadMessageIndex);`
	`114`	`+ var record = _chunkReader.TryReadAt(maxPosition, ReadMessageIndex, false);`
`115`	`115`	`if (record == null)`
`116`	`116`	`{`
`117`	`117`	`continue;`
`118`	`118`	`}`
`119`	`119`	`var chunkLastMessagePosition = record.MessageLogPosition - 1;`
`120`		`-`
`121`	`120`	`if (chunkLastMessagePosition < minMessagePosition)`
`122`	`121`	`{`
`123`	`122`	`if (_chunkManager.RemoveChunk(chunk))`
`124`	`123`	`{`
`125`		`- _logger.InfoFormat("Queue chunk {0} is deleted, chunk last message position: {1}", chunk, chunkLastMessagePosition);`
	`124`	`+ _logger.InfoFormat("Queue (topic: {0}, queueId: {1}) chunk #{2} is deleted, chunkLastMessagePosition: {3}, messageStoreMinMessagePosition: {4}", Topic, QueueId, chunk.ChunkHeader.ChunkNumber, chunkLastMessagePosition, minMessagePosition);`
`126`	`125`	`}`
`127`	`126`	`}`
`128`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,10 +284,6 @@ private void InitNew(int chunkNumber)`
`284`	`284`	`try`
`285`	`285`	`{`
`286`	`286`	`_memoryChunk = Chunk.CreateNew(_filename, chunkNumber, _chunkManager, _chunkConfig, true);`
`287`		`- if (_logger.IsDebugEnabled)`
`288`		`- {`
`289`		`- _logger.DebugFormat("Cached new chunk {0} to memory.", this);`
`290`		`- }`
`291`	`287`	`}`
`292`	`288`	`catch (OutOfMemoryException)`
`293`	`289`	`{`
`@@ -403,10 +399,6 @@ private void InitOngoing<T>(Func<byte[], T> readRecordFunc) where T : ILogRecord`
`403`	`399`	`try`
`404`	`400`	`{`
`405`	`401`	`_memoryChunk = Chunk.FromOngoingFile<T>(_filename, _chunkManager, _chunkConfig, readRecordFunc, true);`
`406`		`- if (_logger.IsDebugEnabled)`
`407`		`- {`
`408`		`- _logger.DebugFormat("Cached ongoing chunk {0} to memory.", this);`
`409`		`- }`
`410`	`402`	`}`
`411`	`403`	`catch (OutOfMemoryException)`
`412`	`404`	`{`
`@@ -454,10 +446,6 @@ public bool TryCacheInMemory(bool shouldCacheNextChunk)`
`454`	`446`	`return false;`
`455`	`447`	`}`
`456`	`448`	`_memoryChunk = Chunk.FromCompletedFile(_filename, _chunkManager, _chunkConfig, true);`
`457`		`- if (_logger.IsDebugEnabled)`
`458`		`- {`
`459`		`- _logger.DebugFormat("Cached completed chunk {0} to memory.", this);`
`460`		`- }`
`461`	`449`	`if (shouldCacheNextChunk)`
`462`	`450`	`{`
`463`	`451`	`Task.Factory.StartNew(() => _chunkManager.TryCacheNextChunk(this));`
`@@ -490,10 +478,6 @@ public bool UnCacheFromMemory()`
`490`	`478`	`var memoryChunk = _memoryChunk;`
`491`	`479`	`_memoryChunk = null;`
`492`	`480`	`memoryChunk.Dispose();`
`493`		`- if (_logger.IsDebugEnabled)`
`494`		`- {`
`495`		`- _logger.DebugFormat("Uncached completed chunk {0} from memory.", this);`
`496`		`- }`
`497`	`481`	`return true;`
`498`	`482`	`}`
`499`	`483`	`catch (Exception ex)`
`@@ -503,7 +487,7 @@ public bool UnCacheFromMemory()`
`503`	`487`	`}`
`504`	`488`	`}`
`505`	`489`	`}`
`506`		`- public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T : class, ILogRecord`
	`490`	`+ public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord`
`507`	`491`	`{`
`508`	`492`	`if (_isDestroying)`
`509`	`493`	`{`
`@@ -512,8 +496,6 @@ public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T`
`512`	`496`
`513`	`497`	`_lastActiveTime = DateTime.Now;`
`514`	`498`
`515`		`- _chunkManager.TryCacheNextChunk(this);`
`516`		`-`
`517`	`499`	`if (!_isMemoryChunk)`
`518`	`500`	`{`
`519`	`501`	`if (_cacheItems != null)`
`@@ -544,7 +526,7 @@ public T TryReadAt<T>(long dataPosition, Func<byte[], T> readRecordFunc) where T`
`544`	`526`	`}`
`545`	`527`	`}`
`546`	`528`
`547`		`- if (!_isMemoryChunk && _isCompleted && Interlocked.CompareExchange(ref _cachingChunk, 1, 0) == 0)`
	`529`	`+ if (autoCache && !_isMemoryChunk && _isCompleted && Interlocked.CompareExchange(ref _cachingChunk, 1, 0) == 0)`
`548`	`530`	`{`
`549`	`531`	`Task.Factory.StartNew(() => TryCacheInMemory(true));`
`550`	`532`	`}`
`@@ -1229,9 +1211,8 @@ private void PrintReadStatus()`
`1229`	`1211`	`var cacheReadThroughput = cacheItemReadCount - _previousCacheReadCount;`
`1230`	`1212`	`_previousCacheReadCount = cacheItemReadCount;`
`1231`	`1213`
`1232`		`- _logger.DebugFormat("Read status: chunk: {0}, currentTime: {1}, fileRead: {2}/s, unmanagedRead: {3}/s, cacheRead: {4}/s",`
`1233`		`- this,`
`1234`		`- DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"),`
	`1214`	`+ _logger.DebugFormat("Read status: chunkNum: #{0}, fileRead: {1}/s, unmanagedRead: {2}/s, cacheRead: {3}/s",`
	`1215`	`+ ChunkHeader.ChunkNumber,`
`1235`	`1216`	`fileReadThroughput,`
`1236`	`1217`	`unmanagedReadThroughput,`
`1237`	`1218`	`cacheReadThroughput);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ChunkReader(ChunkManager chunkManager, ChunkWriter chunkWriter)`
`19`	`19`	`_chunkWriter = chunkWriter;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc) where T : class, ILogRecord`
	`22`	`+ public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc, bool autoCache = true) where T : class, ILogRecord`
`23`	`23`	`{`
`24`	`24`	`var lastChunk = _chunkWriter.CurrentChunk;`
`25`	`25`	`var maxPosition = lastChunk.GlobalDataPosition;`
`@@ -38,7 +38,7 @@ public T TryReadAt<T>(long position, Func<byte[], T> readRecordFunc) where T : c`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`var localPosition = chunk.ChunkHeader.GetLocalDataPosition(position);`
`41`		`- return chunk.TryReadAt(localPosition, readRecordFunc);`
	`41`	`+ return chunk.TryReadAt(localPosition, readRecordFunc, autoCache);`
`42`	`42`	`}`
`43`	`43`	`public BufferLogRecord TryReadRecordBufferAt(long position)`
`44`	`44`	`{`