Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Revise IDisposable semantics of the SQLiteStreamAdapter class: stop setting the contained (not owned) stream to null when disposed. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | sessions |
| Files: | files | file ages | folders |
| SHA1: |
057f76abdc5fc4cbb89017ad8ea2fc42 |
| User & Date: | mistachkin 2017-10-11 23:58:34 |
Context
|
2017-10-12
| ||
| 00:00 | Add tests for LoadDifferencesFromTable and stream-based change set creation. check-in: e3f513c15d user: mistachkin tags: sessions | |
|
2017-10-11
| ||
| 23:58 | Revise IDisposable semantics of the SQLiteStreamAdapter class: stop setting the contained (not owned) stream to null when disposed. check-in: 057f76abdc user: mistachkin tags: sessions | |
| 21:22 | Add tests for Apply and CombineWith. check-in: d1def95f7b user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteSession.cs.
11 12 13 14 15 16 17 18 19 20 21 22 23 24 ... 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 ... 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 ... 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 ... 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 .... 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 |
#if DEBUG
using System.Diagnostics;
#endif
using System.IO;
using System.Globalization;
using System.Runtime.InteropServices;
namespace System.Data.SQLite
{
#region Session Extension Enumerations
public enum SQLiteChangeSetConflictType
{
Data = 1,
................................................................................
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamAdapter Class
internal sealed class SQLiteStreamAdapter : IDisposable
{
#region Private Data
private Stream stream;
private SQLiteConnectionFlags flags;
#endregion
///////////////////////////////////////////////////////////////////////
#region Public Constructors
public SQLiteStreamAdapter(
................................................................................
return flags;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Native Callback Methods
public SQLiteErrorCode xInput(
IntPtr context,
IntPtr pData,
ref int nData
)
{
try
{
if (stream == null)
return SQLiteErrorCode.Misuse;
if (nData > 0)
{
byte[] bytes = new byte[nData];
nData = stream.Read(bytes, 0, nData);
if (nData > 0)
Marshal.Copy(bytes, 0, pData, nData);
}
return SQLiteErrorCode.Ok;
}
................................................................................
}
return SQLiteErrorCode.IoErr_Read;
}
///////////////////////////////////////////////////////////////////////
public SQLiteErrorCode xOutput(
IntPtr context,
IntPtr pData,
int nData
)
{
try
{
if (stream == null)
return SQLiteErrorCode.Misuse;
if (nData > 0)
{
byte[] bytes = new byte[nData];
Marshal.Copy(pData, bytes, 0, nData);
stream.Write(bytes, 0, nData);
}
stream.Flush();
return SQLiteErrorCode.Ok;
}
catch (Exception e)
{
try
{
................................................................................
///////////////////////////////////////////////////////////////////////
private /* protected virtual */ void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
{
////////////////////////////////////
// dispose managed resources here...
////////////////////////////////////
if (stream != null)
stream = null; /* NOT OWNED */
}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
................................................................................
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Methods
private void CheckHandle()
{
if (changeGroup == null)
throw new InvalidOperationException("change group not open");
}
///////////////////////////////////////////////////////////////////////
private void Initialize()
{
|
> | | > > > | | | > > > | | | | | | | | | | | | | | | | < < < | |
11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 ... 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 ... 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 ... 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 ... 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 .... 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 |
#if DEBUG using System.Diagnostics; #endif using System.IO; using System.Globalization; using System.Runtime.InteropServices; using System.Threading; namespace System.Data.SQLite { #region Session Extension Enumerations public enum SQLiteChangeSetConflictType { Data = 1, ................................................................................ /////////////////////////////////////////////////////////////////////////// #region SQLiteStreamAdapter Class internal sealed class SQLiteStreamAdapter : IDisposable { #region Private Data private Stream stream; /* EXEMPT: NOT OWNED */ private SQLiteConnectionFlags flags; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteStreamAdapter( ................................................................................ return flags; } #endregion /////////////////////////////////////////////////////////////////////// #region Native Callback Methods internal SQLiteErrorCode xInput( IntPtr context, IntPtr pData, ref int nData ) { try { Stream localStream = Interlocked.CompareExchange( ref stream, null, null); if (localStream == null) return SQLiteErrorCode.Misuse; if (nData > 0) { byte[] bytes = new byte[nData]; nData = localStream.Read(bytes, 0, nData); if (nData > 0) Marshal.Copy(bytes, 0, pData, nData); } return SQLiteErrorCode.Ok; } ................................................................................ } return SQLiteErrorCode.IoErr_Read; } /////////////////////////////////////////////////////////////////////// internal SQLiteErrorCode xOutput( IntPtr context, IntPtr pData, int nData ) { try { Stream localStream = Interlocked.CompareExchange( ref stream, null, null); if (localStream == null) return SQLiteErrorCode.Misuse; if (nData > 0) { byte[] bytes = new byte[nData]; Marshal.Copy(pData, bytes, 0, nData); localStream.Write(bytes, 0, nData); } localStream.Flush(); return SQLiteErrorCode.Ok; } catch (Exception e) { try { ................................................................................ /////////////////////////////////////////////////////////////////////// private /* protected virtual */ void Dispose(bool disposing) { try { //if (!disposed) //{ // if (disposing) // { // //////////////////////////////////// // // dispose managed resources here... // //////////////////////////////////// // } // ////////////////////////////////////// // // release unmanaged resources here... // ////////////////////////////////////// //} } finally { // // NOTE: Everything should be fully disposed at this point. // disposed = true; ................................................................................ #endregion /////////////////////////////////////////////////////////////////////// #region Private Methods private void CheckHandle() { if (changeGroup == IntPtr.Zero) throw new InvalidOperationException("change group not open"); } /////////////////////////////////////////////////////////////////////// private void Initialize() { |
Changes to System.Data.SQLite/UnsafeNativeMethods.cs.
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
...
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
|
using System.Runtime.InteropServices; #if (NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 || NET_462) && !PLATFORM_COMPACTFRAMEWORK using System.Runtime.Versioning; #endif #if !PLATFORM_COMPACTFRAMEWORK using System.Text; #endif #if !PLATFORM_COMPACTFRAMEWORK || COUNT_HANDLE using System.Threading; #endif using System.Xml; ................................................................................ result.Append(ElementSeparator); result.Append(ToDisplayString(value)); } if (result.Length > 0) { result.Insert(0, ArrayOpen); result.Append(ArrayClose); } return result.ToString(); } #endregion } |
<
<
>
>
>
>
>
|
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
...
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
|
using System.Runtime.InteropServices; #if (NET_40 || NET_45 || NET_451 || NET_452 || NET_46 || NET_461 || NET_462) && !PLATFORM_COMPACTFRAMEWORK using System.Runtime.Versioning; #endif using System.Text; #if !PLATFORM_COMPACTFRAMEWORK || COUNT_HANDLE using System.Threading; #endif using System.Xml; ................................................................................ result.Append(ElementSeparator); result.Append(ToDisplayString(value)); } if (result.Length > 0) { #if PLATFORM_COMPACTFRAMEWORK result.Insert(0, ArrayOpen.ToString()); #else result.Insert(0, ArrayOpen); #endif result.Append(ArrayClose); } return result.ToString(); } #endregion } |