Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Improve SQLiteDataReader performance slightly by caching the connection flags. Add RefreshFlags method to the SQLiteDataReader class to forcibly refresh its connection flags. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
910381a7e357331082a906db6e2d017f |
User & Date: | mistachkin 2014-07-19 00:17:05.677 |
Context
2014-07-19
| ||
00:22 | Fix line endings. check-in: 413872c668 user: mistachkin tags: trunk | |
00:17 | Improve SQLiteDataReader performance slightly by caching the connection flags. Add RefreshFlags method to the SQLiteDataReader class to forcibly refresh its connection flags. check-in: 910381a7e3 user: mistachkin tags: trunk | |
00:14 | Bump all versions to 1.0.94.0. check-in: f56f7104f7 user: mistachkin tags: trunk | |
Changes
Changes to System.Data.SQLite/SQLiteDataReader.cs.
︙ | ︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 | /// </summary> public sealed class SQLiteDataReader : DbDataReader { /// <summary> /// Underlying command this reader is attached to /// </summary> private SQLiteCommand _command; /// <summary> /// Index of the current statement in the command being processed /// </summary> private int _activeStatementIndex; /// <summary> /// Current statement being Read() /// </summary> | > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | /// </summary> public sealed class SQLiteDataReader : DbDataReader { /// <summary> /// Underlying command this reader is attached to /// </summary> private SQLiteCommand _command; /// <summary> /// The flags pertaining to the associated connection (via the command). /// </summary> private SQLiteConnectionFlags _flags; /// <summary> /// Index of the current statement in the command being processed /// </summary> private int _activeStatementIndex; /// <summary> /// Current statement being Read() /// </summary> |
︙ | ︙ | |||
104 105 106 107 108 109 110 111 112 113 114 115 116 117 | _command = cmd; _version = _command.Connection._version; _baseSchemaName = _command.Connection._baseSchemaName; _commandBehavior = behave; _activeStatementIndex = -1; _rowsAffected = -1; SQLiteConnection.OnChanged(GetConnection(this), new ConnectionEventArgs(SQLiteConnectionEventType.NewDataReader, null, null, _command, this, null, null, new object[] { behave })); if (_command != null) NextResult(); | > > | 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | _command = cmd; _version = _command.Connection._version; _baseSchemaName = _command.Connection._baseSchemaName; _commandBehavior = behave; _activeStatementIndex = -1; _rowsAffected = -1; RefreshFlags(); SQLiteConnection.OnChanged(GetConnection(this), new ConnectionEventArgs(SQLiteConnectionEventType.NewDataReader, null, null, _command, this, null, null, new object[] { behave })); if (_command != null) NextResult(); |
︙ | ︙ | |||
311 312 313 314 315 316 317 318 319 320 321 322 323 324 | if (_keyInfo == null) return _fieldCount; return _fieldCount + _keyInfo.Count; } } /// <summary> /// Returns the number of rows seen so far in the current result set. /// </summary> public int StepCount { get | > > > > > > > > > > > | 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 | if (_keyInfo == null) return _fieldCount; return _fieldCount + _keyInfo.Count; } } /// <summary> /// Forces the connection flags cached by this data reader to be refreshed /// from the underlying connection. /// </summary> public void RefreshFlags() { CheckDisposed(); _flags = SQLiteCommand.GetFlags(_command); } /// <summary> /// Returns the number of rows seen so far in the current result set. /// </summary> public int StepCount { get |
︙ | ︙ | |||
357 358 359 360 361 362 363 | /// <param name="i">The index of the column to type-check</param> /// <param name="typ">The type we want to get out of the column</param> private TypeAffinity VerifyType(int i, DbType typ) { CheckClosed(); CheckValidRow(); | | | 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 | /// <param name="i">The index of the column to type-check</param> /// <param name="typ">The type we want to get out of the column</param> private TypeAffinity VerifyType(int i, DbType typ) { CheckClosed(); CheckValidRow(); TypeAffinity affinity = GetSQLiteType(_flags, i).Affinity; switch (affinity) { case TypeAffinity.Int64: if (typ == DbType.Int16) return affinity; if (typ == DbType.Int32) return affinity; if (typ == DbType.Int64) return affinity; |
︙ | ︙ | |||
502 503 504 505 506 507 508 | public override string GetDataTypeName(int i) { CheckDisposed(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetDataTypeName(i - VisibleFieldCount); | | | 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | public override string GetDataTypeName(int i) { CheckDisposed(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetDataTypeName(i - VisibleFieldCount); SQLiteType typ = GetSQLiteType(_flags, i); if (typ.Type == DbType.Object) return SQLiteConvert.SQLiteTypeToType(typ).Name; return _activeStatement._sql.ColumnType(_activeStatement, i, out typ.Affinity); } /// <summary> /// Retrieve the column as a date/time value /// </summary> |
︙ | ︙ | |||
567 568 569 570 571 572 573 | public override Type GetFieldType(int i) { CheckDisposed(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetFieldType(i - VisibleFieldCount); | | | 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 | public override Type GetFieldType(int i) { CheckDisposed(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetFieldType(i - VisibleFieldCount); return SQLiteConvert.SQLiteTypeToType(GetSQLiteType(_flags, i)); } /// <summary> /// Returns a column as a float value /// </summary> /// <param name="i">The index of the column to retrieve</param> /// <returns>float</returns> |
︙ | ︙ | |||
916 917 918 919 920 921 922 | tbl.Columns.Add(SchemaTableOptionalColumn.IsReadOnly, typeof(Boolean)); tbl.Columns.Add(SchemaTableOptionalColumn.ProviderSpecificDataType, typeof(Type)); tbl.Columns.Add(SchemaTableOptionalColumn.DefaultValue, typeof(object)); tbl.Columns.Add("DataTypeName", typeof(string)); tbl.Columns.Add("CollationType", typeof(string)); tbl.BeginLoadData(); | < < | | 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 | tbl.Columns.Add(SchemaTableOptionalColumn.IsReadOnly, typeof(Boolean)); tbl.Columns.Add(SchemaTableOptionalColumn.ProviderSpecificDataType, typeof(Type)); tbl.Columns.Add(SchemaTableOptionalColumn.DefaultValue, typeof(object)); tbl.Columns.Add("DataTypeName", typeof(string)); tbl.Columns.Add("CollationType", typeof(string)); tbl.BeginLoadData(); for (int n = 0; n < _fieldCount; n++) { SQLiteType sqlType = GetSQLiteType(_flags, n); row = tbl.NewRow(); DbType typ = sqlType.Type; // Default settings for the column row[SchemaTableColumn.ColumnName] = GetName(n); |
︙ | ︙ | |||
1129 1130 1131 1132 1133 1134 1135 | { CheckDisposed(); CheckValidRow(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetValue(i - VisibleFieldCount); | < | | | | | 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 | { CheckDisposed(); CheckValidRow(); if (i >= VisibleFieldCount && _keyInfo != null) return _keyInfo.GetValue(i - VisibleFieldCount); SQLiteType typ = GetSQLiteType(_flags, i); if (((_flags & SQLiteConnectionFlags.DetectTextAffinity) == SQLiteConnectionFlags.DetectTextAffinity) && ((typ == null) || (typ.Affinity == TypeAffinity.Text))) { typ = GetSQLiteType( typ, _activeStatement._sql.GetText(_activeStatement, i)); } else if (((_flags & SQLiteConnectionFlags.DetectStringType) == SQLiteConnectionFlags.DetectStringType) && ((typ == null) || SQLiteConvert.IsStringDbType(typ.Type))) { typ = GetSQLiteType( typ, _activeStatement._sql.GetText(_activeStatement, i)); } return _activeStatement._sql.GetValue(_activeStatement, _flags, i, typ); } /// <summary> /// Retreives the values of multiple columns, up to the size of the supplied array /// </summary> /// <param name="values">The array to fill with values from the columns in the current resultset</param> /// <returns>The number of columns retrieved</returns> |
︙ | ︙ | |||
1217 1218 1219 1220 1221 1222 1223 | // NOTE: If the "sticky" flag has been set, use the new behavior, // which returns non-zero if there were ever any rows in // the associated result sets. Generally, this flag is only // useful when it is necessary to retain compatibility with // other ADO.NET providers that use these same semantics for // the HasRows property. // | | | 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 | // NOTE: If the "sticky" flag has been set, use the new behavior, // which returns non-zero if there were ever any rows in // the associated result sets. Generally, this flag is only // useful when it is necessary to retain compatibility with // other ADO.NET providers that use these same semantics for // the HasRows property. // if ((_flags & SQLiteConnectionFlags.StickyHasRows) == SQLiteConnectionFlags.StickyHasRows) return ((_readingState != 1) || (_stepCount > 0)); // // NOTE: This is the default behavior. It returns non-zero only if // more rows are available (i.e. a call to the Read method is // expected to succeed). Prior to the introduction of the // "sticky" flag, this is how this property has always worked. |
︙ | ︙ | |||
1388 1389 1390 1391 1392 1393 1394 | { // do nothing. } return null; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 | { // do nothing. } return null; } /// <summary> /// Retrieves the SQLiteType for a given column and row value. /// </summary> /// <param name="oldType"> /// The original SQLiteType structure, based only on the column. /// </param> /// <param name="text"> |
︙ | ︙ |