Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Introduce some private abstract base classes to isolate the differences between memory and stream enumeration. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | sessions |
| Files: | files | file ages | folders |
| SHA1: |
04332df7d6a86dc03325e020780901bd |
| User & Date: | mistachkin 2017-10-06 17:39:08.342 |
Context
|
2017-10-06
| ||
| 18:06 | Work on cleaning up the enumerator/iterator classes and P/Invoke integration. check-in: c82ab41db1 user: mistachkin tags: sessions | |
| 17:39 | Introduce some private abstract base classes to isolate the differences between memory and stream enumeration. check-in: 04332df7d6 user: mistachkin tags: sessions | |
| 16:08 | Remove unused IsPatchSet property from the ISQLiteChangeSet interface. check-in: 54ac954062 user: mistachkin tags: sessions | |
Changes
Changes to System.Data.SQLite/SQLiteSessions.cs.
| ︙ | ︙ | |||
131 132 133 134 135 136 137 |
string tableName
);
}
#endregion
///////////////////////////////////////////////////////////////////////////
| < | < | | < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 |
string tableName
);
}
#endregion
///////////////////////////////////////////////////////////////////////////
internal abstract class SQLiteChangeSetIterator : IDisposable
{
#region Private Data
private IntPtr iterator;
#endregion
///////////////////////////////////////////////////////////////////////
#region Protected Constructors
protected SQLiteChangeSetIterator(
IntPtr iterator
)
{
this.iterator = iterator;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Protected Methods
protected void CheckHandle()
{
if (iterator == IntPtr.Zero)
throw new InvalidOperationException("iterator is not open");
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Public Methods
public void Next()
{
|
| ︙ | ︙ | |||
301 302 303 304 305 306 307 |
typeof(SQLiteChangeSetIterator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
| | | 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 |
typeof(SQLiteChangeSetIterator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected virtual void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
//{
|
| ︙ | ︙ | |||
325 326 327 328 329 330 331 |
if (iterator != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3changeset_finalize(
iterator);
iterator = IntPtr.Zero;
}
| < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 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 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 |
if (iterator != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3changeset_finalize(
iterator);
iterator = IntPtr.Zero;
}
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteChangeSetIterator()
{
Dispose(false);
}
#endregion
}
///////////////////////////////////////////////////////////////////////////
#region SQLiteMemoryChangeSetIterator Class
internal sealed class SQLiteMemoryChangeSetIterator :
SQLiteChangeSetIterator
{
#region Private Data
private IntPtr pData;
#endregion
///////////////////////////////////////////////////////////////////////
#region Private Constructors
private SQLiteMemoryChangeSetIterator(
IntPtr pData,
IntPtr iterator
)
: base(iterator)
{
this.pData = pData;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Static "Factory" Methods
public static SQLiteMemoryChangeSetIterator Create(
byte[] rawData
)
{
if (rawData == null)
throw new ArgumentNullException("rawData");
SQLiteMemoryChangeSetIterator result = null;
IntPtr pData = IntPtr.Zero;
IntPtr iterator = IntPtr.Zero;
try
{
int nData = 0;
pData = SQLiteBytes.ToIntPtr(rawData, ref nData);
if (pData == IntPtr.Zero)
throw new SQLiteException(SQLiteErrorCode.NoMem, null);
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_start(
ref iterator, nData, pData);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_start");
result = new SQLiteMemoryChangeSetIterator(pData, iterator);
}
finally
{
if (result == null)
{
if (iterator != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3changeset_finalize(
iterator);
iterator = IntPtr.Zero;
}
if (pData != IntPtr.Zero)
{
SQLiteMemory.Free(pData);
pData = IntPtr.Zero;
}
}
}
return result;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteMemoryChangeSetIterator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
//
// NOTE: Must dispose of the base class first (leaky abstraction)
// because it contains the iterator handle, which must be
// closed *prior* to freeing the underlying memory.
//
base.Dispose(disposing);
try
{
if (!disposed)
{
//if (disposing)
//{
// ////////////////////////////////////
// // dispose managed resources here...
// ////////////////////////////////////
//}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
if (pData != IntPtr.Zero)
{
SQLiteMemory.Free(pData);
pData = IntPtr.Zero;
}
}
}
finally
{
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamChangeSetIterator Class
internal sealed class SQLiteStreamChangeSetIterator :
SQLiteChangeSetIterator
{
#region Private Constructors
private SQLiteStreamChangeSetIterator(
IntPtr iterator
)
: base(iterator)
{
// do nothing.
}
#endregion
///////////////////////////////////////////////////////////////////////
#region Static "Factory" Methods
public static SQLiteStreamChangeSetIterator Create(
Stream stream,
SQLiteConnectionFlags flags
)
{
if (stream == null)
throw new ArgumentNullException("stream");
SQLiteStreamChangeSetIterator result = null;
IntPtr iterator = IntPtr.Zero;
try
{
SQLiteErrorCode rc = UnsafeNativeMethods.sqlite3changeset_start_strm(
ref iterator, new SQLiteStreamAdapter(stream, flags).xInput,
IntPtr.Zero);
if (rc != SQLiteErrorCode.Ok)
throw new SQLiteException(rc, "sqlite3changeset_start_strm");
result = new SQLiteStreamChangeSetIterator(iterator);
}
finally
{
if (result == null)
{
if (iterator != IntPtr.Zero)
{
UnsafeNativeMethods.sqlite3changeset_finalize(
iterator);
iterator = IntPtr.Zero;
}
}
}
return result;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteStreamChangeSetIterator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
//if (disposing)
//{
// ////////////////////////////////////
// // dispose managed resources here...
// ////////////////////////////////////
//}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
|
| ︙ | ︙ | |||
922 923 924 925 926 927 928 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteMemoryChangeSet Class
| | | 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteMemoryChangeSet Class
internal sealed class SQLiteMemoryChangeSet :
ISQLiteChangeSet, IEnumerable<ISQLiteChangeSetMetadataItem>,
IDisposable
{
#region Private Data
private byte[] rawData;
private SQLiteConnectionHandle handle;
private SQLiteConnectionFlags flags;
|
| ︙ | ︙ | |||
1200 1201 1202 1203 1204 1205 1206 |
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable<ISQLiteChangeSetMetadataItem> Members
public IEnumerator<ISQLiteChangeSetMetadataItem> GetEnumerator()
{
| | | 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 |
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable<ISQLiteChangeSetMetadataItem> Members
public IEnumerator<ISQLiteChangeSetMetadataItem> GetEnumerator()
{
return new SQLiteMemoryChangeSetEnumerator(rawData);
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable Members
IEnumerator System.Collections.IEnumerable.GetEnumerator()
|
| ︙ | ︙ | |||
1285 1286 1287 1288 1289 1290 1291 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamChangeSet Class
| | | 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamChangeSet Class
internal sealed class SQLiteStreamChangeSet :
ISQLiteChangeSet, IEnumerable<ISQLiteChangeSetMetadataItem>,
IDisposable
{
#region Private Data
private Stream inputStream;
private Stream outputStream;
private SQLiteConnectionHandle handle;
|
| ︙ | ︙ | |||
1495 1496 1497 1498 1499 1500 1501 |
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable<ISQLiteChangeSetMetadataItem> Members
public IEnumerator<ISQLiteChangeSetMetadataItem> GetEnumerator()
{
| | | 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 |
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable<ISQLiteChangeSetMetadataItem> Members
public IEnumerator<ISQLiteChangeSetMetadataItem> GetEnumerator()
{
return new SQLiteStreamChangeSetEnumerator(inputStream, flags);
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerable Members
IEnumerator System.Collections.IEnumerable.GetEnumerator()
|
| ︙ | ︙ | |||
1583 1584 1585 1586 1587 1588 1589 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteChangeSetEnumerator Class
| | < < < | < | < | < < < < < | | 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 |
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteChangeSetEnumerator Class
internal abstract class SQLiteChangeSetEnumerator :
IEnumerator<ISQLiteChangeSetMetadataItem>
{
#region Private Data
private SQLiteChangeSetIterator iterator;
#endregion
///////////////////////////////////////////////////////////////////////
#region Public Constructors
public SQLiteChangeSetEnumerator(
SQLiteChangeSetIterator iterator
)
{
this.iterator = iterator;
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IEnumerator<ISQLiteChangeSetMetadataItem> Members
public ISQLiteChangeSetMetadataItem Current
|
| ︙ | ︙ | |||
1670 1671 1672 1673 1674 1675 1676 |
typeof(SQLiteChangeSetEnumerator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
| | | 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 |
typeof(SQLiteChangeSetEnumerator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected virtual void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
{
|
| ︙ | ︙ | |||
1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 |
///////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteChangeSetEnumerator()
{
Dispose(false);
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 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 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 |
///////////////////////////////////////////////////////////////////////
#region Destructor
~SQLiteChangeSetEnumerator()
{
Dispose(false);
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteMemoryChangeSetEnumerator Class
internal sealed class SQLiteMemoryChangeSetEnumerator :
SQLiteChangeSetEnumerator
{
#region Public Constructors
public SQLiteMemoryChangeSetEnumerator(
byte[] rawData
)
: base(SQLiteMemoryChangeSetIterator.Create(rawData))
{
// do nothing.
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteMemoryChangeSetEnumerator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
if (!disposed)
{
if (disposing)
{
////////////////////////////////////
// dispose managed resources here...
////////////////////////////////////
}
//////////////////////////////////////
// release unmanaged resources here...
//////////////////////////////////////
}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
#region SQLiteStreamChangeSetEnumerator Class
internal sealed class SQLiteStreamChangeSetEnumerator :
SQLiteChangeSetEnumerator
{
#region Public Constructors
public SQLiteStreamChangeSetEnumerator(
Stream stream,
SQLiteConnectionFlags flags
)
: base(SQLiteStreamChangeSetIterator.Create(stream, flags))
{
// do nothing.
}
#endregion
///////////////////////////////////////////////////////////////////////
#region IDisposable "Pattern" Members
private bool disposed;
private void CheckDisposed() /* throw */
{
#if THROW_ON_DISPOSED
if (disposed)
{
throw new ObjectDisposedException(
typeof(SQLiteStreamChangeSetEnumerator).Name);
}
#endif
}
///////////////////////////////////////////////////////////////////////
protected override void Dispose(bool disposing)
{
try
{
//if (!disposed)
//{
// if (disposing)
// {
// ////////////////////////////////////
// // dispose managed resources here...
// ////////////////////////////////////
// }
// //////////////////////////////////////
// // release unmanaged resources here...
// //////////////////////////////////////
//}
}
finally
{
base.Dispose(disposing);
//
// NOTE: Everything should be fully disposed at this point.
//
disposed = true;
}
}
#endregion
}
#endregion
///////////////////////////////////////////////////////////////////////////
|
| ︙ | ︙ |