Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Incomplete work in progress on stream adapter object lifetime fixes. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | sessionStreamManager |
Files: | files | file ages | folders |
SHA1: |
c4fb95f1eb9275fc36d7f08b5dcc6dfc |
User & Date: | mistachkin 2017-10-12 22:27:05.161 |
Context
2017-10-13
| ||
16:47 | Further adjustments. check-in: fc3f62b4be user: mistachkin tags: sessionStreamManager | |
2017-10-12
| ||
22:27 | Incomplete work in progress on stream adapter object lifetime fixes. check-in: c4fb95f1eb user: mistachkin tags: sessionStreamManager | |
20:04 | Add stream tests for the CombineWith and Apply methods. check-in: cce9d5de83 user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteSession.cs.
︙ | ︙ | |||
706 707 708 709 710 711 712 713 714 715 716 717 718 719 | /////////////////////////////////////////////////////////////////////////// #region SQLiteStreamChangeSetIterator Class internal sealed class SQLiteStreamChangeSetIterator : SQLiteChangeSetIterator { #region Private Constructors private SQLiteStreamChangeSetIterator( IntPtr iterator, bool ownHandle ) : base(iterator, ownHandle) { | > > > > > > > | > > > < | > | > | > | > > > > > > > | 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 | /////////////////////////////////////////////////////////////////////////// #region SQLiteStreamChangeSetIterator Class internal sealed class SQLiteStreamChangeSetIterator : SQLiteChangeSetIterator { #region Private Data private SQLiteStreamAdapter streamAdapter; #endregion /////////////////////////////////////////////////////////////////////// #region Private Constructors private SQLiteStreamChangeSetIterator( SQLiteStreamAdapter streamAdapter, IntPtr iterator, bool ownHandle ) : base(iterator, ownHandle) { this.streamAdapter = streamAdapter; } #endregion /////////////////////////////////////////////////////////////////////// #region Static "Factory" Methods public static SQLiteStreamChangeSetIterator Create( Stream stream, SQLiteConnectionFlags flags ) { if (stream == null) throw new ArgumentNullException("stream"); SQLiteStreamAdapter streamAdapter = null; SQLiteStreamChangeSetIterator result = null; IntPtr iterator = IntPtr.Zero; try { streamAdapter = new SQLiteStreamAdapter(stream, flags); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_start_strm( ref iterator, streamAdapter.xInput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) { throw new SQLiteException( rc, "sqlite3changeset_start_strm"); } result = new SQLiteStreamChangeSetIterator( streamAdapter, iterator, true); } finally { if (result == null) { if (iterator != IntPtr.Zero) { UnsafeNativeMethods.sqlite3changeset_finalize( iterator); iterator = IntPtr.Zero; } if (streamAdapter != null) { streamAdapter.Dispose(); streamAdapter = null; } } } return result; } #endregion |
︙ | ︙ | |||
844 845 846 847 848 849 850 | return flags; } #endregion /////////////////////////////////////////////////////////////////////// #region Native Callback Methods | | > > > | | | | > > > | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 | return flags; } #endregion /////////////////////////////////////////////////////////////////////// #region Native Callback Methods public SQLiteErrorCode xInput( IntPtr context, IntPtr pData, ref int nData ) { CheckDisposed(); try { Stream localStream = Interlocked.CompareExchange( ref stream, null, null); if (localStream == null) return SQLiteErrorCode.Misuse; if (nData > 0) { byte[] bytes = new byte[nData]; int nRead = localStream.Read(bytes, 0, nData); if (nRead > 0) { if (pData != IntPtr.Zero) Marshal.Copy(bytes, 0, pData, nRead); nData = nRead; } } return SQLiteErrorCode.Ok; } catch (Exception e) { try |
︙ | ︙ | |||
895 896 897 898 899 900 901 | } return SQLiteErrorCode.IoErr_Read; } /////////////////////////////////////////////////////////////////////// | | > > > | > | 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 | } return SQLiteErrorCode.IoErr_Read; } /////////////////////////////////////////////////////////////////////// public SQLiteErrorCode xOutput( IntPtr context, IntPtr pData, int nData ) { CheckDisposed(); try { Stream localStream = Interlocked.CompareExchange( ref stream, null, null); if (localStream == null) return SQLiteErrorCode.Misuse; if (nData > 0) { byte[] bytes = new byte[nData]; if (pData != IntPtr.Zero) Marshal.Copy(pData, bytes, 0, nData); localStream.Write(bytes, 0, nData); } localStream.Flush(); return SQLiteErrorCode.Ok; } |
︙ | ︙ | |||
976 977 978 979 980 981 982 | /////////////////////////////////////////////////////////////////////// private /* protected virtual */ void Dispose(bool disposing) { try { | | < > | < > | | | < | > | | | | > > | 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 | /////////////////////////////////////////////////////////////////////// private /* protected virtual */ void Dispose(bool disposing) { try { if (!disposed) { if (disposing) { //////////////////////////////////// // dispose managed resources here... //////////////////////////////////// } ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// Interlocked.Exchange(ref stream, null); /* NOT OWNED */ } } finally { // // NOTE: Everything should be fully disposed at this point. // disposed = true; |
︙ | ︙ | |||
1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteChangeGroup Class internal sealed class SQLiteChangeGroup : ISQLiteChangeGroup { #region Private Data private SQLiteConnectionFlags flags; /////////////////////////////////////////////////////////////////////// private IntPtr changeGroup; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteChangeGroup( SQLiteConnectionFlags flags ) { this.flags = flags; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > | 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteSessionStreamManager Class internal sealed class SQLiteSessionStreamManager : IDisposable { #region Private Data private Dictionary<Stream, SQLiteStreamAdapter> streamAdapters; private SQLiteConnectionFlags flags; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteSessionStreamManager( SQLiteConnectionFlags flags ) { this.flags = flags; InitializeStreamAdapters(); } #endregion /////////////////////////////////////////////////////////////////////// #region Private Methods private void InitializeStreamAdapters() { if (streamAdapters != null) return; streamAdapters = new Dictionary<Stream, SQLiteStreamAdapter>(); } /////////////////////////////////////////////////////////////////////// private void DisposeStreamAdapters() { if (streamAdapters == null) return; foreach (KeyValuePair<Stream, SQLiteStreamAdapter> pair in streamAdapters) { SQLiteStreamAdapter streamAdapter = pair.Value; if (streamAdapter == null) continue; streamAdapter.Dispose(); } streamAdapters.Clear(); streamAdapters = null; } #endregion /////////////////////////////////////////////////////////////////////// #region Public Methods public SQLiteStreamAdapter GetAdapter( Stream stream ) { CheckDisposed(); if (stream == null) return null; SQLiteStreamAdapter streamAdapter; if (streamAdapters.TryGetValue(stream, out streamAdapter)) return streamAdapter; streamAdapter = new SQLiteStreamAdapter(stream, flags); streamAdapters.Add(stream, streamAdapter); return streamAdapter; } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable Members public void Dispose() { Dispose(true); GC.SuppressFinalize(this); } #endregion /////////////////////////////////////////////////////////////////////// #region IDisposable "Pattern" Members private bool disposed; private void CheckDisposed() /* throw */ { #if THROW_ON_DISPOSED if (disposed) { throw new ObjectDisposedException( typeof(SQLiteSessionStreamManager).Name); } #endif } /////////////////////////////////////////////////////////////////////// private /* protected virtual */ void Dispose(bool disposing) { try { if (!disposed) { if (disposing) { //////////////////////////////////// // dispose managed resources here... //////////////////////////////////// DisposeStreamAdapters(); } ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// } } finally { // // NOTE: Everything should be fully disposed at this point. // disposed = true; } } #endregion /////////////////////////////////////////////////////////////////////// #region Destructor ~SQLiteSessionStreamManager() { Dispose(false); } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteChangeGroup Class internal sealed class SQLiteChangeGroup : ISQLiteChangeGroup { #region Private Data private SQLiteSessionStreamManager streamManager; private SQLiteConnectionFlags flags; /////////////////////////////////////////////////////////////////////// private IntPtr changeGroup; #endregion /////////////////////////////////////////////////////////////////////// #region Public Constructors public SQLiteChangeGroup( SQLiteConnectionFlags flags ) { this.flags = flags; InitializeHandle(); } #endregion /////////////////////////////////////////////////////////////////////// #region Private Methods private void CheckHandle() { if (changeGroup == IntPtr.Zero) throw new InvalidOperationException("change group not open"); } /////////////////////////////////////////////////////////////////////// private void InitializeHandle() { if (changeGroup != IntPtr.Zero) return; SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changegroup_new( ref changeGroup); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changegroup_new"); } /////////////////////////////////////////////////////////////////////// private void InitializeStreamManager() { if (streamManager != null) return; streamManager = new SQLiteSessionStreamManager(flags); } /////////////////////////////////////////////////////////////////////// private SQLiteStreamAdapter GetStreamAdapter( Stream stream ) { InitializeStreamManager(); return streamManager.GetAdapter(stream); } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteChangeGroup Members public void AddChangeSet( byte[] rawData |
︙ | ︙ | |||
1108 1109 1110 1111 1112 1113 1114 1115 1116 | ) { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changegroup_add_strm( | > > > > > > > > < | | 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 | ) { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteStreamAdapter streamAdapter = GetStreamAdapter(stream); if (streamAdapter == null) { throw new SQLiteException( "could not get or create adapter for input stream"); } SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changegroup_add_strm( changeGroup, streamAdapter.xInput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changegroup_add_strm"); } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1163 1164 1165 1166 1167 1168 1169 1170 1171 | ) { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changegroup_output_strm( | > > > > > > > > < | | 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 | ) { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteStreamAdapter streamAdapter = GetStreamAdapter(stream); if (streamAdapter == null) { throw new SQLiteException( "could not get or create adapter for output stream"); } SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changegroup_output_strm( changeGroup, streamAdapter.xOutput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changegroup_output_strm"); } #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1212 1213 1214 1215 1216 1217 1218 | { if (disposing) { //////////////////////////////////// // dispose managed resources here... //////////////////////////////////// | | < < | | > > > > > > > > | 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 | { if (disposing) { //////////////////////////////////// // dispose managed resources here... //////////////////////////////////// if (streamManager != null) { streamManager.Dispose(); streamManager = null; } } ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// if (changeGroup != IntPtr.Zero) { UnsafeNativeMethods.sqlite3changegroup_delete( changeGroup); changeGroup = IntPtr.Zero; } } } finally { // // NOTE: Everything should be fully disposed at this point. // |
︙ | ︙ | |||
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 | /////////////////////////////////////////////////////////////////////////// #region SQLiteSession Class internal sealed class SQLiteSession : SQLiteConnectionLock, ISQLiteSession { #region Private Data private string databaseName; /////////////////////////////////////////////////////////////////////// private IntPtr session; /////////////////////////////////////////////////////////////////////// | > | 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 | /////////////////////////////////////////////////////////////////////////// #region SQLiteSession Class internal sealed class SQLiteSession : SQLiteConnectionLock, ISQLiteSession { #region Private Data private SQLiteSessionStreamManager streamManager; private string databaseName; /////////////////////////////////////////////////////////////////////// private IntPtr session; /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1277 1278 1279 1280 1281 1282 1283 | SQLiteConnectionFlags flags, string databaseName ) : base(handle, flags) { this.databaseName = databaseName; | | | | 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 | SQLiteConnectionFlags flags, string databaseName ) : base(handle, flags) { this.databaseName = databaseName; InitializeHandle(); } #endregion /////////////////////////////////////////////////////////////////////// #region Private Methods private void CheckHandle() { if (session == IntPtr.Zero) throw new InvalidOperationException("session is not open"); } /////////////////////////////////////////////////////////////////////// private void InitializeHandle() { if (session != IntPtr.Zero) return; SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3session_create( GetIntPtr(), SQLiteString.GetUtf8BytesFromString(databaseName), ref session); |
︙ | ︙ | |||
1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 | { this.tableFilterCallback = callback; this.tableFilterClientData = clientData; return (callback != null) ? xFilter : (UnsafeNativeMethods.xSessionFilter)null; } /////////////////////////////////////////////////////////////////////// #region Native Callback Methods private int xFilter( IntPtr context, /* NOT USED */ IntPtr pTblName | > > > > > > > > > > > > > > > > > > > > > | 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 | { this.tableFilterCallback = callback; this.tableFilterClientData = clientData; return (callback != null) ? xFilter : (UnsafeNativeMethods.xSessionFilter)null; } /////////////////////////////////////////////////////////////////////// private void InitializeStreamManager() { if (streamManager != null) return; streamManager = new SQLiteSessionStreamManager(GetFlags()); } /////////////////////////////////////////////////////////////////////// private SQLiteStreamAdapter GetStreamAdapter( Stream stream ) { InitializeStreamManager(); return streamManager.GetAdapter(stream); } /////////////////////////////////////////////////////////////////////// #region Native Callback Methods private int xFilter( IntPtr context, /* NOT USED */ IntPtr pTblName |
︙ | ︙ | |||
1503 1504 1505 1506 1507 1508 1509 | { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); | > | > | > > > > < | | 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 | { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteStreamAdapter streamAdapter = GetStreamAdapter(stream); if (streamAdapter == null) { throw new SQLiteException( "could not get or create adapter for output stream"); } SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3session_changeset_strm( session, streamAdapter.xOutput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3session_changeset_strm"); } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1558 1559 1560 1561 1562 1563 1564 | { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); | > | > | > > > > < | | 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 | { CheckDisposed(); CheckHandle(); if (stream == null) throw new ArgumentNullException("stream"); SQLiteStreamAdapter streamAdapter = GetStreamAdapter(stream); if (streamAdapter == null) { throw new SQLiteException( "could not get or create adapter for output stream"); } SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3session_patchset_strm( session, streamAdapter.xOutput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3session_patchset_strm"); } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
1643 1644 1645 1646 1647 1648 1649 | protected override void Dispose(bool disposing) { try { if (!disposed) { | | < > | | | | > > > > > > | 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 | protected override void Dispose(bool disposing) { try { if (!disposed) { if (disposing) { //////////////////////////////////// // dispose managed resources here... //////////////////////////////////// if (streamManager != null) { streamManager.Dispose(); streamManager = null; } } ////////////////////////////////////// // release unmanaged resources here... ////////////////////////////////////// if (session != IntPtr.Zero) { |
︙ | ︙ | |||
2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 | /////////////////////////////////////////////////////////////////////////// #region SQLiteStreamChangeSet Class internal sealed class SQLiteStreamChangeSet : SQLiteChangeSetBase, ISQLiteChangeSet { #region Private Data private Stream inputStream; private Stream outputStream; #endregion /////////////////////////////////////////////////////////////////////// #region Private Constructors | > > | 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 | /////////////////////////////////////////////////////////////////////////// #region SQLiteStreamChangeSet Class internal sealed class SQLiteStreamChangeSet : SQLiteChangeSetBase, ISQLiteChangeSet { #region Private Data private SQLiteStreamAdapter inputStreamAdapter; private SQLiteStreamAdapter outputStreamAdapter; private Stream inputStream; private Stream outputStream; #endregion /////////////////////////////////////////////////////////////////////// #region Private Constructors |
︙ | ︙ | |||
2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 | private void CheckInputStream() { if (inputStream == null) { throw new InvalidOperationException( "input stream unavailable"); } } /////////////////////////////////////////////////////////////////////// private void CheckOutputStream() { if (outputStream == null) { throw new InvalidOperationException( "output stream unavailable"); } } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteChangeSet Members public ISQLiteChangeSet Invert() { CheckDisposed(); CheckInputStream(); CheckOutputStream(); | > > > > > > > > > > > > < < | | | 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 | private void CheckInputStream() { if (inputStream == null) { throw new InvalidOperationException( "input stream unavailable"); } if (inputStreamAdapter == null) { inputStreamAdapter = new SQLiteStreamAdapter( inputStream, GetFlags()); } } /////////////////////////////////////////////////////////////////////// private void CheckOutputStream() { if (outputStream == null) { throw new InvalidOperationException( "output stream unavailable"); } if (outputStreamAdapter == null) { outputStreamAdapter = new SQLiteStreamAdapter( outputStream, GetFlags()); } } #endregion /////////////////////////////////////////////////////////////////////// #region ISQLiteChangeSet Members public ISQLiteChangeSet Invert() { CheckDisposed(); CheckInputStream(); CheckOutputStream(); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_invert_strm( inputStreamAdapter.xInput, IntPtr.Zero, outputStreamAdapter.xOutput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changeset_invert_strm"); return null; } |
︙ | ︙ | |||
2228 2229 2230 2231 2232 2233 2234 | { throw new ArgumentException( "not a stream based change set", "changeSet"); } streamChangeSet.CheckInputStream(); | < < < | | < | | 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 | { throw new ArgumentException( "not a stream based change set", "changeSet"); } streamChangeSet.CheckInputStream(); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_concat_strm( inputStreamAdapter.xInput, IntPtr.Zero, streamChangeSet.inputStreamAdapter.xInput, IntPtr.Zero, outputStreamAdapter.xOutput, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changeset_concat_strm"); return null; } |
︙ | ︙ | |||
2275 2276 2277 2278 2279 2280 2281 | UnsafeNativeMethods.xSessionFilter xFilter = GetDelegate( tableFilterCallback, clientData); UnsafeNativeMethods.xSessionConflict xConflict = GetDelegate( conflictCallback, clientData); | < < | | | 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 | UnsafeNativeMethods.xSessionFilter xFilter = GetDelegate( tableFilterCallback, clientData); UnsafeNativeMethods.xSessionConflict xConflict = GetDelegate( conflictCallback, clientData); SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_apply_strm( GetIntPtr(), inputStreamAdapter.xInput, IntPtr.Zero, xFilter, xConflict, IntPtr.Zero); if (rc != SQLiteErrorCode.Ok) throw new SQLiteException(rc, "sqlite3changeset_apply_strm"); } #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ |
Changes to Tests/session.eagle.
︙ | ︙ | |||
86 87 88 89 90 91 92 | return [object invoke -flags +NonPublic \ System.Data.SQLite.HelperMethods ToDisplayString $value] } } ############################################################################### | > > > > > > > > > > > | > > > > | | < < | | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | return [object invoke -flags +NonPublic \ System.Data.SQLite.HelperMethods ToDisplayString $value] } } ############################################################################### proc createMemoryChangeSetForConnection { connection rawData } { if {[isObjectHandle $connection] && $connection ne "null"} then { return [$connection -alias \ -objectflags +NoReturnReference CreateChangeSet $rawData] } return null } ############################################################################### proc createMemoryChangeSetForSession { session {patch false} } { if {[isObjectHandle $session] && $session ne "null"} then { set byteArray null if {$patch} then { $session -alias CreatePatchSet byteArray } else { $session -alias CreateChangeSet byteArray } return [createByteArray [arrayToList byteArray]] } return null } ############################################################################### |
︙ | ︙ | |||
150 151 152 153 154 155 156 | } return false } ############################################################################### | | > > > | > > | 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | } return false } ############################################################################### proc writeStreamChangeSetForSession { session fileName {patch false} } { if {[isObjectHandle $session] && $session ne "null"} then { set stream [object create -alias \ System.IO.FileStream $fileName Create Write] if {$patch} then { $session -alias CreatePatchSet $stream } else { $session -alias CreateChangeSet $stream } $stream Flush; $stream Close return true } return false } |
︙ | ︙ | |||
238 239 240 241 242 243 244 | ############################################################################### proc matchSession { connection session expr } { if {[isObjectHandle $session] && $session ne "null"} then { if {![$session IsEmpty]} then { set rawData [createMemoryChangeSetForSession $session] | < | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | ############################################################################### proc matchSession { connection session expr } { if {[isObjectHandle $session] && $session ne "null"} then { if {![$session IsEmpty]} then { set rawData [createMemoryChangeSetForSession $session] if {[isObjectHandle $rawData] && $rawData ne "null"} then { return [matchChangeSet [set changeSet \ [$connection -alias CreateChangeSet $rawData]] $expr] } } } |
︙ | ︙ | |||
334 335 336 337 338 339 340 | $session AttachTable $tableName if {![isObjectHandle $session] || $session eq "null"} then { error "cannot create session" } catch {uplevel 1 $script} | | < < < | 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 | $session AttachTable $tableName if {![isObjectHandle $session] || $session eq "null"} then { error "cannot create session" } catch {uplevel 1 $script} return [createMemoryChangeSetForSession $session] } ############################################################################### proc captureChangeSetFile { connection databaseName tableName script fileName } { if {![isObjectHandle $connection] || $connection eq "null"} then { |
︙ | ︙ | |||
386 387 388 389 390 391 392 | return $result } ############################################################################### proc createByteArray { list } { set length [llength $list] | > | > > > > > | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 | return $result } ############################################################################### proc createByteArray { list } { set length [llength $list] set result [object create -alias \ -objectflags +NoReturnReference System.Byte\[\] $length] for {set index 0} {$index < $length} {incr index} { set element [lindex $list $index] set value [object invoke -create Byte Parse $element] $result SetValue $value $index } # # NOTE: Prevent returning, which unsets all local variables, # from causing the byte array object to be disposed. # object addref $result; object addref $result; return $result } ############################################################################### proc tableFilterCallbackT1 { clientData name } { lappend ::callbackResults [object invoke -create \ System.Boolean Parse [expr {[$name ToString] in [list t1]}]] |
︙ | ︙ | |||
449 450 451 452 453 454 455 | set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] | | > | 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 | set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] debug break writeRawDataToFile $fileName(1) $rawData writeStreamChangeSetForSession $session $fileName(2) openStreamChangeSetForConnection $connection $fileName(2) "" state list [expr {[file size $fileName(1)] > 0}] \ [string equal [readFile $fileName(1)] [readFile $fileName(2)]] \ |
︙ | ︙ | |||
507 508 509 510 511 512 513 | set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] | < | > > | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 | set session [$connection -alias CreateSession main] $session AttachTable null makeSomeChanges $db t1 [list insert update delete] set rawData [createMemoryChangeSetForSession $session] set changeSet(1) \ [createMemoryChangeSetForConnection $connection $rawData] set changeSet(2) [$changeSet(1) -alias Invert] list [changeSetToString $changeSet(2) true] } -cleanup { cleanupSomeText unset -nocomplain changeSet rawData byteArray session |
︙ | ︙ | |||
629 630 631 632 633 634 635 | $session SetToDisabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] | < < | > > | 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 | $session SetToDisabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] lappend result Length [$rawData Length] $session SetToEnabled lappend result IsEnabled [$session IsEnabled] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] set changeSet(1) \ [createMemoryChangeSetForConnection $connection $rawData] lappend result [changeSetToString $changeSet(1) false] } -cleanup { cleanupSomeText unset -nocomplain result changeSet rawData byteArray session freeDbConnection |
︙ | ︙ | |||
688 689 690 691 692 693 694 | $session SetToIndirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] | < < | > > | 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | $session SetToIndirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] $session SetToDirect lappend result IsIndirect [$session IsIndirect] makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createMemoryChangeSetForSession $session] set changeSet(1) \ [createMemoryChangeSetForConnection $connection $rawData] lappend result [changeSetToString $changeSet(1) false] } -cleanup { cleanupSomeText unset -nocomplain result changeSet rawData byteArray session freeDbConnection |
︙ | ︙ | |||
809 810 811 812 813 814 815 | createTheSchema $db main makeSomeChanges $db t1 [list insert insert] set connection [getDbConnection] set rawData(1) [captureChangeSetRawData $connection main null { makeSomeChanges $db t1 [list delete] 1 | | | | > > | > > | 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 | createTheSchema $db main makeSomeChanges $db t1 [list insert insert] set connection [getDbConnection] set rawData(1) [captureChangeSetRawData $connection main null { makeSomeChanges $db t1 [list delete] 1 }] makeSomeChanges $db t1 [list insert] 1 set rawData(2) [captureChangeSetRawData $connection main null { makeSomeChanges $db t1 [list insert] }] set changeSet(1) \ [createMemoryChangeSetForConnection $connection $rawData(1)] set changeSet(2) \ [createMemoryChangeSetForConnection $connection $rawData(2)] set changeSet(3) [$changeSet(1) -alias CombineWith $changeSet(2)] $changeSet(3) -marshalflags +DynamicCallback \ Apply conflictCallback null list [changeSetToString $changeSet(3) true] Data \ [sql execute -execute reader -format list $db \ |
︙ | ︙ | |||
1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 | rename changeSetToString "" rename metadataItemToString "" rename changeSetFileToString "" rename writeStreamChangeSetForSession "" rename openStreamChangeSetForConnection "" rename writeRawDataToFile "" rename createMemoryChangeSetForSession "" rename forDisplay "" rename cleanupSomeText "" rename getSomeText "" ############################################################################### runSQLiteTestEpilogue runTestEpilogue | > | 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 | rename changeSetToString "" rename metadataItemToString "" rename changeSetFileToString "" rename writeStreamChangeSetForSession "" rename openStreamChangeSetForConnection "" rename writeRawDataToFile "" rename createMemoryChangeSetForSession "" rename createMemoryChangeSetForConnection "" rename forDisplay "" rename cleanupSomeText "" rename getSomeText "" ############################################################################### runSQLiteTestEpilogue runTestEpilogue |