* DataTable.cs :

  - Table stores default values for columns in soecial default values row. It is allocated once (in NewRow)
  - DataTable.Copy rewrited. It works with uninitialized rows for better perfomance.
  - OnRemoveColumn has nothing to perform by now.

svn path=/trunk/mcs/; revision=29765

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 2ad2d5225603d0fc1f946bf4ec44d964bbbf37e0..70c3daf49bf6172fabf79d321e4b9351d24cdc2a 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-17  Boris Kirzner  <borisk@mainsoft.com>
+
+       * DataTable.cs :
+         - Table stores default values for columns in soecial default values row. 
+         It is allocated once (in NewRow)
+         - DataTable.Copy rewrited. It works with uninitialized rows for better perfomance.
+         - OnRemoveColumn has nothing to perform by now.
+
 2004-06-17  Boris Kirzner  <borisk@mainsoft.com>
 
        * DataRow.cs : 

diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
index ff1bd773e051fa9184c66832409e6db359e8349f..6ac20a9283a8813565516802657c795206224c34 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataTable.cs
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -91,6 +91,7 @@ namespace System.Data {
                private DataRowBuilder _rowBuilder;
                private ArrayList _indexes;
                private RecordCache _recordCache;
+               private int _defaultValuesRowIndex = -1;
                protected internal bool fInitInProgress;
 
                // If CaseSensitive property is changed once it does not anymore follow owner DataSet's 
@@ -740,19 +741,29 @@ namespace System.Data {
                /// </summary>
                public DataTable Copy () 
                {
-                       DataTable Copy = new DataTable ();
-                       CopyProperties (Copy);
+                       DataTable copy = Clone();
 
-                       // we can not simply copy the row values (NewRow [C.ColumnName] = Row [C.ColumnName])
-                       // because if the row state is deleted we get an exception.
-                       Copy._duringDataLoad = true;
-                       foreach (DataRow Row in Rows) {
-                               DataRow NewRow = Copy.NewRow ();
-                               Copy.Rows.Add (NewRow);
-                               Row.CopyValuesToRow(NewRow);
+                       copy._duringDataLoad = true;
+                       foreach (DataRow row in Rows) {
+                               DataRow newRow = copy.NewNotInitializedRow();
+                               copy.Rows.Add(newRow);
+                               CopyRow(row,newRow);
+                       }
+                       copy._duringDataLoad = false;           
+                       return copy;
+               }
+
+               internal void CopyRow(DataRow fromRow,DataRow toRow)
+               {
+                       fromRow.CopyState(toRow);
+
+                       if (fromRow.HasVersion(DataRowVersion.Original)) {
+                               toRow._original = toRow.Table.RecordCache.CopyRecord(this,fromRow._original,-1);
+                       }
+
+                       if (fromRow.HasVersion(DataRowVersion.Current)) {
+                               toRow._current = toRow.Table.RecordCache.CopyRecord(this,fromRow._current,-1);
                        }
-                       Copy._duringDataLoad = false;           
-                       return Copy;
                }
 
                private void CopyProperties (DataTable Copy) 
@@ -967,6 +978,13 @@ namespace System.Data {
                        
                }
 
+               internal int DefaultValuesRowIndex
+               {
+                       get {
+                               return _defaultValuesRowIndex;
+                       }       
+               }
+
                /// <summary>
                /// This member is only meant to support Mono's infrastructure          
                /// </summary>
@@ -1140,6 +1158,15 @@ namespace System.Data {
                        
                        // new row get id -1.
                        _rowBuilder._rowId = -1;
+
+                       // initialize default values row for the first time
+                       if ( _defaultValuesRowIndex == -1 ) {
+                               _defaultValuesRowIndex = RecordCache.NewRecord();
+                               foreach(DataColumn column in Columns) {
+                                       column.DataContainer[_defaultValuesRowIndex] = column.DefaultValue;
+                               }
+                       }
+
                        return this.NewRowFromBuilder (_rowBuilder);
                }
 
@@ -1160,7 +1187,10 @@ namespace System.Data {
                        return new DataRow (builder);
                }
                
-               
+               internal DataRow NewNotInitializedRow()
+               {
+                       return new DataRow(this,-1);
+               }
 
 #if NET_2_0
                [MonoTODO]
@@ -1530,13 +1560,9 @@ namespace System.Data {
                /// </summary>
                [MonoTODO]
                protected internal virtual void OnRemoveColumn (DataColumn column) {
-                       //      if (null != RemoveColumn)
-                       //      {
-                       //              RemoveColumn(this, e);
-                       //      }
-                       this.Rows.onColumnRemoved(column.Ordinal);
                }
 
+
                /// <summary>
                /// Raises the RowChanged event.
                /// </summary>