s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1079 from RefinePro/issue-796

Browse Source 
fixed issue #796 Columnize by key/value columns creates empty lines
This commit is contained in:
Martin Magdinier 2015-10-08 14:01:07 -04:00
commit 8b4a1d577a
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/com/google/refine/model/ColumnModel.java
View File

@ -81,6 +81,14 @@ public class ColumnModel implements Jsonizable {
return ++_maxCellIndex;
}
synchronized public void removeCellIndex(int index) {
if (index > _maxCellIndex - 1)
return;
columns.remove(index);
_maxCellIndex--;
}
synchronized public void setKeyColumnIndex(int keyColumnIndex) {
// TODO: check validity of new cell index, e.g., it's not in any group
this._keyColumnIndex = keyColumnIndex;

12
main/src/com/google/refine/operations/cell/KeyValueColumnizeOperation.java
View File

@ -251,6 +251,18 @@ public class KeyValueColumnizeOperation extends AbstractOperation {
allColumns.addAll(newColumns);
allColumns.addAll(newNoteColumns);
// clean up the reused column model and row model
int smallIndex = Math.min(keyColumnIndex, valueColumnIndex);
int bigIndex = Math.max(keyColumnIndex, valueColumnIndex);
project.columnModel.removeCellIndex(bigIndex);
project.columnModel.removeCellIndex(smallIndex);
for (Row row : newRows) {
row.cells.remove(bigIndex);
row.cells.remove(smallIndex);
}
return new HistoryEntry(
historyEntryID,
project,

12
main/tests/server/src/com/google/refine/operations/cell/TransposeTests.java
View File

@ -140,13 +140,15 @@ public class TransposeTests extends RefineTest {
Assert.assertEquals(project.columnModel.columns.get(3).getName(), "c");
Assert.assertEquals(project.columnModel.columns.get(4).getName(), "d");
Assert.assertEquals(project.rows.size(), 3);
Assert.assertEquals(project.rows.get(0).cells.size(), 5);
Assert.assertEquals(project.rows.get(1).cells.size(), 5);
// the last 2 cells are not added as expected, the size is 5-2
Assert.assertEquals(project.rows.get(0).cells.size(), 5 - 2);
Assert.assertEquals(project.rows.get(1).cells.size(), 5 - 1);
Assert.assertEquals(project.rows.get(2).cells.size(), 5);
Assert.assertEquals(project.rows.get(0).cells.get(0).value, "data1");
Assert.assertEquals(project.rows.get(0).cells.get(1).value, "data2");
Assert.assertEquals(project.rows.get(0).cells.get(2).value, "data3");
Assert.assertEquals(project.rows.get(0).cells.get(0).value, "1");
Assert.assertEquals(project.rows.get(0).cells.get(1).value, "1");
Assert.assertEquals(project.rows.get(0).cells.get(2).value, "3");
}