Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Move string related marshalling methods to the new SQLiteString static class. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | virtualTables |
Files: | files | file ages | folders |
SHA1: |
0d7f2bfcca90176ad56bbfd4f70d2cb5 |
User & Date: | mistachkin 2013-06-21 07:15:30.869 |
Context
2013-06-21
| ||
07:21 | Rename the SQLiteModuleBase class to SQLiteModule. check-in: f0ccb3cd64 user: mistachkin tags: virtualTables | |
07:15 | Move string related marshalling methods to the new SQLiteString static class. check-in: 0d7f2bfcca user: mistachkin tags: virtualTables | |
07:06 | Add LogErrors and LogExceptions properties to the SQLiteModuleBase class. Allow the ISQLiteNativeModule implementation of the SQLiteModuleBase class to be overridden; however, remove it as a formal interface. check-in: deb17e28f2 user: mistachkin tags: virtualTables | |
Changes
Changes to System.Data.SQLite/SQLite3.cs.
︙ | ︙ | |||
1589 1590 1591 1592 1593 1594 1595 | SetLoadExtension(true); LoadExtension(UnsafeNativeMethods.SQLITE_DLL, "sqlite3_vtshim_init"); IntPtr pName = IntPtr.Zero; try { | | | 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 | SetLoadExtension(true); LoadExtension(UnsafeNativeMethods.SQLITE_DLL, "sqlite3_vtshim_init"); IntPtr pName = IntPtr.Zero; try { pName = SQLiteString.Utf8IntPtrFromString(module.Name); UnsafeNativeMethods.sqlite3_module nativeModule = module.CreateNativeModule(); if (UnsafeNativeMethods.sqlite3_create_disposable_module( _sql, pName, ref nativeModule, IntPtr.Zero, null) != IntPtr.Zero) |
︙ | ︙ | |||
1674 1675 1676 1677 1678 1679 1680 | return SQLiteErrorCode.Error; } IntPtr pSql = IntPtr.Zero; try { | | | 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 | return SQLiteErrorCode.Error; } IntPtr pSql = IntPtr.Zero; try { pSql = SQLiteString.Utf8IntPtrFromString(strSql); SQLiteErrorCode n = UnsafeNativeMethods.sqlite3_declare_vtab( _sql, pSql); if ((n == SQLiteErrorCode.Ok) && (module != null)) module.Declared = true; |
︙ | ︙ |
Changes to System.Data.SQLite/SQLiteModuleBase.cs.
︙ | ︙ | |||
12 13 14 15 16 17 18 | #if TRACK_MEMORY_BYTES using System.Threading; #endif namespace System.Data.SQLite { | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #if TRACK_MEMORY_BYTES using System.Threading; #endif namespace System.Data.SQLite { #region SQLiteContext Helper Class public sealed class SQLiteContext { #region Private Data private IntPtr pContext; #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
88 89 90 91 92 93 94 | /////////////////////////////////////////////////////////////////////// public void SetString(string value) { if (pContext == IntPtr.Zero) throw new InvalidOperationException(); | | | | 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 | /////////////////////////////////////////////////////////////////////// public void SetString(string value) { if (pContext == IntPtr.Zero) throw new InvalidOperationException(); byte[] bytes = SQLiteString.GetUtf8BytesFromString(value); if (bytes == null) throw new ArgumentNullException("value"); UnsafeNativeMethods.sqlite3_result_text( pContext, bytes, bytes.Length, (IntPtr)(-1)); } /////////////////////////////////////////////////////////////////////// public void SetError(string value) { if (pContext == IntPtr.Zero) throw new InvalidOperationException(); byte[] bytes = SQLiteString.GetUtf8BytesFromString(value); if (bytes == null) throw new ArgumentNullException("value"); UnsafeNativeMethods.sqlite3_result_error( pContext, bytes, bytes.Length); } |
︙ | ︙ | |||
182 183 184 185 186 187 188 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteValue Helper Class public sealed class SQLiteValue { #region Private Data private IntPtr pValue; #endregion /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
298 299 300 301 302 303 304 | } /////////////////////////////////////////////////////////////////////// public string GetString() { if (pValue == IntPtr.Zero) return null; | | | 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 | } /////////////////////////////////////////////////////////////////////// public string GetString() { if (pValue == IntPtr.Zero) return null; return SQLiteString.StringFromUtf8IntPtr(pValue, GetBytes()); } /////////////////////////////////////////////////////////////////////// public byte[] GetBlob() { if (pValue == IntPtr.Zero) return null; |
︙ | ︙ | |||
378 379 380 381 382 383 384 | GreaterThanOrEqualTo = 32, Match = 64 } #endregion /////////////////////////////////////////////////////////////////////////// | | | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | GreaterThanOrEqualTo = 32, Match = 64 } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexConstraint Helper Class public sealed class SQLiteIndexConstraint { #region Internal Constructors internal SQLiteIndexConstraint( UnsafeNativeMethods.sqlite3_index_constraint constraint ) : this(constraint.iColumn, constraint.op, constraint.usable, |
︙ | ︙ | |||
431 432 433 434 435 436 437 | public int iTermOffset; #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | public int iTermOffset; #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexOrderBy Helper Class public sealed class SQLiteIndexOrderBy { #region Internal Constructors internal SQLiteIndexOrderBy( UnsafeNativeMethods.sqlite3_index_orderby orderBy ) : this(orderBy.iColumn, orderBy.desc) |
︙ | ︙ | |||
471 472 473 474 475 476 477 | public byte desc; /* True for DESC. False for ASC. */ #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 | public byte desc; /* True for DESC. False for ASC. */ #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexConstraintUsage Helper Class public sealed class SQLiteIndexConstraintUsage { #region Internal Constructors internal SQLiteIndexConstraintUsage( UnsafeNativeMethods.sqlite3_index_constraint_usage constraintUsage ) : this(constraintUsage.argvIndex, constraintUsage.omit) |
︙ | ︙ | |||
511 512 513 514 515 516 517 | public byte omit; #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 | public byte omit; #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexInputs Helper Class public sealed class SQLiteIndexInputs { #region Internal Constructors internal SQLiteIndexInputs(int nConstraint, int nOrderBy) { constraints = new SQLiteIndexConstraint[nConstraint]; orderBys = new SQLiteIndexOrderBy[nOrderBy]; |
︙ | ︙ | |||
544 545 546 547 548 549 550 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndexOutputs Helper Class public sealed class SQLiteIndexOutputs { #region Internal Constructors internal SQLiteIndexOutputs(int nConstraint) { constraintUsages = new SQLiteIndexConstraintUsage[nConstraint]; } |
︙ | ︙ | |||
613 614 615 616 617 618 619 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteIndex Helper Class public sealed class SQLiteIndex { #region Internal Constructors internal SQLiteIndex( int nConstraint, int nOrderBy ) |
︙ | ︙ | |||
649 650 651 652 653 654 655 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteVirtualTable Base Class /* NOT SEALED */ public class SQLiteVirtualTable : ISQLiteNativeHandle, IDisposable { #region Private Constants private const int ModuleNameIndex = 0; private const int DatabaseNameIndex = 1; private const int TableNameIndex = 2; |
︙ | ︙ | |||
828 829 830 831 832 833 834 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteVirtualTableCursor Base Class /* NOT SEALED */ public class SQLiteVirtualTableCursor : ISQLiteNativeHandle, IDisposable { #region Public Constructors public SQLiteVirtualTableCursor( SQLiteVirtualTable table ) |
︙ | ︙ | |||
1339 1340 1341 1342 1343 1344 1345 | int savepoint /* in */ ); } #endregion /////////////////////////////////////////////////////////////////////////// | | | 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 | int savepoint /* in */ ); } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteMemory Static Class internal static class SQLiteMemory { #region Private Data #if TRACK_MEMORY_BYTES #if PLATFORM_COMPACTFRAMEWORK private static object syncRoot = new object(); #endif |
︙ | ︙ | |||
1428 1429 1430 1431 1432 1433 1434 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteString Static Class internal static class SQLiteString { #region Private Constants private static int ThirtyBits = 0x3fffffff; private static readonly Encoding Utf8Encoding = Encoding.UTF8; #endregion /////////////////////////////////////////////////////////////////////// #region UTF-8 Encoding Helper Methods public static byte[] GetUtf8BytesFromString( string value |
︙ | ︙ | |||
1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 | for (int index = 0; index < result.Length; index++) result[index] = Utf8IntPtrFromString(values[index]); return result; } #endregion /////////////////////////////////////////////////////////////////////// #region SQLiteValue Helper Methods public static SQLiteValue[] ValueArrayFromSizeAndIntPtr( int nData, IntPtr apData | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 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 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 | for (int index = 0; index < result.Length; index++) result[index] = Utf8IntPtrFromString(values[index]); return result; } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteMarshal Static Class internal static class SQLiteMarshal { #region IntPtr Helper Methods public static IntPtr IntPtrForOffset( IntPtr pointer, int offset ) { return new IntPtr(pointer.ToInt64() + offset); } #endregion /////////////////////////////////////////////////////////////////////// #region Marshal Read Helper Methods public static int ReadInt32( IntPtr pointer, int offset ) { #if !PLATFORM_COMPACTFRAMEWORK return Marshal.ReadInt32(pointer, offset); #else return Marshal.ReadInt32(IntPtrForOffset(pointer, offset)); #endif } /////////////////////////////////////////////////////////////////////// public static double ReadDouble( IntPtr pointer, int offset ) { #if !PLATFORM_COMPACTFRAMEWORK return BitConverter.Int64BitsToDouble(Marshal.ReadInt64( pointer, offset)); #else return BitConverter.ToDouble(BitConverter.GetBytes( Marshal.ReadInt64(IntPtrForOffset(pointer, offset))), 0); #endif } /////////////////////////////////////////////////////////////////////// public static IntPtr ReadIntPtr( IntPtr pointer, int offset ) { #if !PLATFORM_COMPACTFRAMEWORK return Marshal.ReadIntPtr(pointer, offset); #else return Marshal.ReadIntPtr(IntPtrForOffset(pointer, offset)); #endif } #endregion /////////////////////////////////////////////////////////////////////// #region Marshal Write Helper Methods public static void WriteInt32( IntPtr pointer, int offset, int value ) { #if !PLATFORM_COMPACTFRAMEWORK Marshal.WriteInt32(pointer, offset, value); #else Marshal.WriteInt32(IntPtrForOffset(pointer, offset), value); #endif } /////////////////////////////////////////////////////////////////////// public static void WriteDouble( IntPtr pointer, int offset, double value ) { #if !PLATFORM_COMPACTFRAMEWORK Marshal.WriteInt64(pointer, offset, BitConverter.DoubleToInt64Bits(value)); #else Marshal.WriteInt64(IntPtrForOffset(pointer, offset), BitConverter.ToInt64(BitConverter.GetBytes(value), 0)); #endif } /////////////////////////////////////////////////////////////////////// public static void WriteIntPtr( IntPtr pointer, int offset, IntPtr value ) { #if !PLATFORM_COMPACTFRAMEWORK Marshal.WriteIntPtr(pointer, offset, value); #else Marshal.WriteIntPtr(IntPtrForOffset(pointer, offset), value); #endif } #endregion /////////////////////////////////////////////////////////////////////// #region Byte Array Helper Methods public static byte[] BytesFromIntPtr( IntPtr pValue, int length ) { if (pValue == IntPtr.Zero) return null; if (length == 0) return new byte[0]; byte[] result = new byte[length]; Marshal.Copy(pValue, result, 0, length); return result; } /////////////////////////////////////////////////////////////////////// public static IntPtr BytesToIntPtr( byte[] value ) { if (value == null) return IntPtr.Zero; int length = value.Length; if (length == 0) return IntPtr.Zero; IntPtr result = SQLiteMemory.Allocate(length); if (result == IntPtr.Zero) return IntPtr.Zero; Marshal.Copy(value, 0, result, length); return result; } #endregion /////////////////////////////////////////////////////////////////////// #region SQLiteValue Helper Methods public static SQLiteValue[] ValueArrayFromSizeAndIntPtr( int nData, IntPtr apData |
︙ | ︙ | |||
1829 1830 1831 1832 1833 1834 1835 | offset += IntPtr.Size; index.Outputs.IndexNumber = ReadInt32(pIndex, offset); offset += sizeof(int); | | | | 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 | offset += IntPtr.Size; index.Outputs.IndexNumber = ReadInt32(pIndex, offset); offset += sizeof(int); index.Outputs.IndexString = SQLiteString.StringFromUtf8IntPtr( IntPtrForOffset(pIndex, offset)); offset += IntPtr.Size; index.Outputs.NeedToFreeIndexString = ReadInt32(pIndex, offset); offset += sizeof(int); |
︙ | ︙ | |||
1991 1992 1993 1994 1995 1996 1997 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// | | | 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 | } #endregion } #endregion /////////////////////////////////////////////////////////////////////////// #region SQLiteModule Base Class /* NOT SEALED */ public abstract class SQLiteModuleBase : ISQLiteManagedModule, /*ISQLiteNativeModule,*/ IDisposable { #region Private Constants private const double DefaultCost = double.MaxValue; #endregion |
︙ | ︙ | |||
2463 2464 2465 2466 2467 2468 2469 | if (error == null) return true; bool success = false; try { | | | 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 | if (error == null) return true; bool success = false; try { pError = SQLiteString.Utf8IntPtrFromString(error); SQLiteMarshal.WriteIntPtr(pVtab, offset, pError); success = true; } finally { if (!success && (pError != IntPtr.Zero)) { |
︙ | ︙ | |||
2571 2572 2573 2574 2575 2576 2577 | IntPtr[] argv, ref IntPtr pVtab, ref IntPtr pError ) { try { | | | | | | | | | | | | 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 | IntPtr[] argv, ref IntPtr pVtab, ref IntPtr pError ) { try { string fileName = SQLiteString.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { SQLiteVirtualTable table = null; string error = null; if (Create(connection, pAux, SQLiteString.StringArrayFromUtf8IntPtrArray(argv), ref table, ref error) == SQLiteErrorCode.Ok) { if (table != null) { pVtab = TableToIntPtr(table); return SQLiteErrorCode.Ok; } else { pError = SQLiteString.Utf8IntPtrFromString( "no table was created"); } } else { pError = SQLiteString.Utf8IntPtrFromString(error); } } } catch (Exception e) /* NOTE: Must catch ALL. */ { pError = SQLiteString.Utf8IntPtrFromString(e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// private SQLiteErrorCode xConnect( IntPtr pDb, IntPtr pAux, int argc, IntPtr[] argv, ref IntPtr pVtab, ref IntPtr pError ) { try { string fileName = SQLiteString.StringFromUtf8IntPtr( UnsafeNativeMethods.sqlite3_db_filename(pDb, IntPtr.Zero)); using (SQLiteConnection connection = new SQLiteConnection( pDb, fileName, false)) { SQLiteVirtualTable table = null; string error = null; if (Connect(connection, pAux, SQLiteString.StringArrayFromUtf8IntPtrArray(argv), ref table, ref error) == SQLiteErrorCode.Ok) { if (table != null) { pVtab = TableToIntPtr(table); return SQLiteErrorCode.Ok; } else { pError = SQLiteString.Utf8IntPtrFromString( "no table was created"); } } else { pError = SQLiteString.Utf8IntPtrFromString(error); } } } catch (Exception e) /* NOTE: Must catch ALL. */ { pError = SQLiteString.Utf8IntPtrFromString(e.ToString()); } return SQLiteErrorCode.Error; } /////////////////////////////////////////////////////////////////////// |
︙ | ︙ | |||
2901 2902 2903 2904 2905 2906 2907 | SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { if (Filter(cursor, idxNum, | | | 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 | SQLiteVirtualTableCursor cursor = CursorFromIntPtr( pVtab, pCursor); if (cursor != null) { if (Filter(cursor, idxNum, SQLiteString.StringFromUtf8IntPtr(idxStr), SQLiteMarshal.ValueArrayFromIntPtrArray( argv)) == SQLiteErrorCode.Ok) { return SQLiteErrorCode.Ok; } } } |
︙ | ︙ | |||
3165 3166 3167 3168 3169 3170 3171 | if (table != null) { SQLiteFunction function = null; if (FindFunction( table, nArg, | | | 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 | if (table != null) { SQLiteFunction function = null; if (FindFunction( table, nArg, SQLiteString.StringFromUtf8IntPtr(zName), ref function, ref pClientData)) { if (function != null) { callback = function.ScalarCallback; return 1; } |
︙ | ︙ | |||
3202 3203 3204 3205 3206 3207 3208 | try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { return Rename(table, | | | 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 | try { SQLiteVirtualTable table = TableFromIntPtr(pVtab); if (table != null) { return Rename(table, SQLiteString.StringFromUtf8IntPtr(zNew)); } } catch (Exception e) /* NOTE: Must catch ALL. */ { SetTableError(pVtab, e.ToString()); } |
︙ | ︙ |