改进释放问题

Author: maikebing

src/Apache.IoTDB/DataStructure/SessionDataSet.cs

@@ -23,8 +23,8 @@ public class SessionDataSet: System.IDisposable
         private int _rowIndex;
         private bool _hasCatchedResult;
         private RowRecord _cachedRowRecord;
-        private readonly bool _isClosed = false;
-
+        private   bool _isClosed = false;
+        private bool disposedValue;
 
         private string TimestampStr => "Time";
         private int StartIndex => 2;
@@ -295,7 +295,7 @@ public async Task Close()
 
                 try
                 {
-                    await myClient.ServiceClient.closeOperationAsync(req);
+                  var status=  await myClient.ServiceClient.closeOperationAsync(req);
                 }
                 catch (TException e)
                 {
@@ -307,16 +307,33 @@ public async Task Close()
                 }
             }
         }
-        ~SessionDataSet()
+
+        protected virtual void Dispose(bool disposing)
         {
-            this.Dispose();
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        this.Close().Wait();
+                    }
+                    catch 
+                    {
+                    }
+                }
+                _queryDataset=null; 
+                _timeBuffer = null;
+                _valueBufferLst = null;
+                _bitmapBufferLst = null;
+                disposedValue = true;
+            }
         }
 
-       
         public void Dispose()
         {
-            this.Close().Wait();
-          
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
         }
     }
 }

src/Apache.IoTDB/SessionPool.cs

@@ -14,7 +14,8 @@
 
 namespace Apache.IoTDB
 {
-    public class SessionPool
+
+    public class SessionPool:IDisposable
     {
         private static int SuccessCode => 200;
         private static readonly TSProtocolVersion ProtocolVersion = TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3;
@@ -104,7 +105,9 @@ public SessionPool(
             _enableRpcCompression = enableRpcCompression;
         }
 
-        ILoggerFactory factory;
+        ILoggerFactory factory;
+        private bool disposedValue;
+
         public void OpenDebugMode(Action<ILoggingBuilder> configure)
         {
             _debugMode = true;
@@ -2091,15 +2094,28 @@ public async Task<List<string>> ShowPathsTemplateUsingOnAsync(string templateNam
             {
                 _clients.Add(client);
             }
-        }
-
-
-
-
-
-
-
-
-
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+#if NET461_OR_GREATER || NETSTANDARD2_0
+#else
+                    _clients.ClientQueue.Clear();
+#endif
+                }
+                _clients = null;
+                disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }