From fefc08596f2fd8e2c51150d14d78b0caa417ed4e Mon Sep 17 00:00:00 2001 From: James Ahlborn Date: Mon, 24 Mar 2008 17:06:24 +0000 Subject: [PATCH] Need to store auto-number values back into row so that indexes can be updated correctly. git-svn-id: https://svn.code.sf.net/p/jackcess/code/jackcess/trunk@296 f203690c-595d-4dc9-a70b-905162fa7fd2 --- src/changes/changes.xml | 6 ++ .../jackcess/Database.java | 4 +- .../healthmarketscience/jackcess/Table.java | 85 +++++++++++++----- test/data/test.mdb | Bin 2904064 -> 3035136 bytes .../jackcess/DatabaseTest.java | 25 ++++-- 5 files changed, 89 insertions(+), 31 deletions(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 7225789..0223e4b 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -5,6 +5,12 @@ James Ahlborn + + + Need to store auto-number values back into row so that indexes can be + updated correctly. + + More fixes for index parsing. Believe index names are now correctly diff --git a/src/java/com/healthmarketscience/jackcess/Database.java b/src/java/com/healthmarketscience/jackcess/Database.java index d3485d8..f49972d 100644 --- a/src/java/com/healthmarketscience/jackcess/Database.java +++ b/src/java/com/healthmarketscience/jackcess/Database.java @@ -851,9 +851,7 @@ public class Database // may have null fields. We always want to add the // same number of columns to the table each time. // - Object[] data = new Object[columnNames.length]; - String[] splitData = line.split(delim); - System.arraycopy(splitData, 0, data, 0, splitData.length); + Object[] data = Table.dupeRow(line.split(delim), columnNames.length); rows.add(filter.filterRow(data)); if (rows.size() == COPY_TABLE_BATCH_SIZE) { table.addRows(rows); diff --git a/src/java/com/healthmarketscience/jackcess/Table.java b/src/java/com/healthmarketscience/jackcess/Table.java index c69fc89..5e8a247 100644 --- a/src/java/com/healthmarketscience/jackcess/Table.java +++ b/src/java/com/healthmarketscience/jackcess/Table.java @@ -1102,6 +1102,13 @@ public class Table /** * Add a single row to this table and write it to disk + *

+ * Note, if this table has an auto-number column, the value written will be + * put back into the given row array. + * + * @param row row values for a single row. the row will be modified if + * this table contains an auto-number column, otherwise it + * will not be modified. */ public void addRow(Object... row) throws IOException { addRows(Collections.singletonList(row), _singleRowBufferH); @@ -1111,7 +1118,13 @@ public class Table * Add multiple rows to this table, only writing to disk after all * rows have been written, and every time a data page is filled. This * is much more efficient than calling addRow multiple times. - * @param rows List of Object[] row values + *

+ * Note, if this table has an auto-number column, the values written will be + * put back into the given row arrays. + * + * @param rows List of Object[] row values. the rows will be modified if + * this table contains an auto-number column, otherwise they + * will not be modified. */ public void addRows(List rows) throws IOException { addRows(rows, _multiRowBufferH); @@ -1119,21 +1132,35 @@ public class Table /** * Add multiple rows to this table, only writing to disk after all - * rows have been written, and every time a data page is filled. This - * is much more efficient than calling addRow multiple times. - * @param rows List of Object[] row values + * rows have been written, and every time a data page is filled. + * @param inRows List of Object[] row values * @param writeRowBufferH TempBufferHolder used to generate buffers for * writing the row data */ - private void addRows(List rows, + private void addRows(List inRows, TempBufferHolder writeRowBufferH) throws IOException { + // copy the input rows to a modifiable list so we can update the elements + List rows = new ArrayList(inRows); ByteBuffer[] rowData = new ByteBuffer[rows.size()]; - Iterator iter = rows.iterator(); - for (int i = 0; iter.hasNext(); i++) { - rowData[i] = createRow(iter.next(), getFormat().MAX_ROW_SIZE, + for (int i = 0; i < rows.size(); i++) { + + // we need to make sure the row is the right length (fill with null). + // note, if the row is copied the caller will not be able to access any + // generated auto-number value, but if they need that info they should + // use a row array of the right size! + Object[] row = rows.get(i); + if(row.length < _columns.size()) { + row = dupeRow(row, _columns.size()); + // we copied the row, so put the copy back into the rows list + rows.set(i, row); + } + + // write the row of data to a temporary buffer + rowData[i] = createRow(row, getFormat().MAX_ROW_SIZE, writeRowBufferH.getPageBuffer(getPageChannel())); + if (rowData[i].limit() > getFormat().MAX_ROW_SIZE) { throw new IOException("Row size " + rowData[i].limit() + " is too large"); @@ -1254,7 +1281,15 @@ public class Table } /** - * Serialize a row of Objects into a byte buffer + * Serialize a row of Objects into a byte buffer. + *

+ * Note, if this table has an auto-number column, the value written will be + * put back into the given row array. + * + * @param rowArray row data, expected to be correct length for this table + * @param maxRowSize max size the data can be for this row + * @param buffer buffer to which to write the row data + * @return the given buffer, filled with the row data */ ByteBuffer createRow(Object[] rowArray, int maxRowSize, ByteBuffer buffer) throws IOException @@ -1262,15 +1297,6 @@ public class Table buffer.putShort(_maxColumnCount); NullMask nullMask = new NullMask(_maxColumnCount); - List