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

Merge remote-tracking branch 'upstream/fix-filldown-blankdown'

Browse Source
This commit is contained in:
Mathieu Saby 2018-11-03 19:16:22 +01:00
commit 13ef66438e
4 changed files with 71 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/src/com/google/refine/operations/cell/BlankDownOperation.java
View File

@ -103,6 +103,7 @@ public class BlankDownOperation extends EngineDependentMassCellOperation {
return new RowVisitor() { return new RowVisitor() {
int cellIndex; int cellIndex;
int keyCellIndex;
List<CellChange> cellChanges; List<CellChange> cellChanges;
Cell previousCell; Cell previousCell;
Mode engineMode; Mode engineMode;
@ -116,7 +117,8 @@ public class BlankDownOperation extends EngineDependentMassCellOperation {
@Override @Override
public void start(Project project) { public void start(Project project) {
// nothing to do keyCellIndex = project.columnModel.columns.get(
project.columnModel.getKeyColumnIndex()).getCellIndex();
} }
@Override @Override
@ -126,7 +128,7 @@ public class BlankDownOperation extends EngineDependentMassCellOperation {
@Override @Override
public boolean visit(Project project, int rowIndex, Row row) { public boolean visit(Project project, int rowIndex, Row row) {
if (engineMode.equals(Mode.RecordBased) && ExpressionUtils.isNonBlankData(row.getCellValue(0))) { if (engineMode.equals(Mode.RecordBased) && ExpressionUtils.isNonBlankData(row.getCellValue(keyCellIndex))) {
previousCell = null; previousCell = null;
} }
Object value = row.getCellValue(cellIndex); Object value = row.getCellValue(cellIndex);

6
main/src/com/google/refine/operations/cell/FillDownOperation.java
View File

@ -105,6 +105,7 @@ public class FillDownOperation extends EngineDependentMassCellOperation {
return new RowVisitor() { return new RowVisitor() {
int cellIndex; int cellIndex;
int keyCellIndex;
List<CellChange> cellChanges; List<CellChange> cellChanges;
Cell previousCell; Cell previousCell;
Mode engineMode; Mode engineMode;
@ -118,7 +119,8 @@ public class FillDownOperation extends EngineDependentMassCellOperation {
@Override @Override
public void start(Project project) { public void start(Project project) {
// nothing to do keyCellIndex = project.columnModel.columns.get(
project.columnModel.getKeyColumnIndex()).getCellIndex();
} }
@Override @Override
@ -129,7 +131,7 @@ public class FillDownOperation extends EngineDependentMassCellOperation {
@Override @Override
public boolean visit(Project project, int rowIndex, Row row) { public boolean visit(Project project, int rowIndex, Row row) {
Object value = row.getCellValue(cellIndex); Object value = row.getCellValue(cellIndex);
if (engineMode.equals(Mode.RecordBased) && ExpressionUtils.isNonBlankData(row.getCellValue(0))) { if (engineMode.equals(Mode.RecordBased) && ExpressionUtils.isNonBlankData(row.getCellValue(keyCellIndex))) {
previousCell = null; previousCell = null;
} }
if (ExpressionUtils.isNonBlankData(value)) { if (ExpressionUtils.isNonBlankData(value)) {

33
main/tests/server/src/com/google/refine/tests/operations/cell/BlankDownTests.java
View File

@ -1,5 +1,7 @@
package com.google.refine.tests.operations.cell; package com.google.refine.tests.operations.cell;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.json.JSONException; import org.json.JSONException;
@ -13,12 +15,16 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectManager; import com.google.refine.ProjectManager;
import com.google.refine.browsing.EngineConfig; import com.google.refine.browsing.EngineConfig;
import com.google.refine.model.AbstractOperation; import com.google.refine.model.AbstractOperation;
import com.google.refine.model.Column;
import com.google.refine.model.Project; import com.google.refine.model.Project;
import com.google.refine.model.Row;
import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.OperationRegistry;
import com.google.refine.operations.cell.BlankDownOperation; import com.google.refine.operations.cell.BlankDownOperation;
import com.google.refine.operations.cell.FillDownOperation;
import com.google.refine.process.Process; import com.google.refine.process.Process;
import com.google.refine.tests.RefineTest; import com.google.refine.tests.RefineTest;
import com.google.refine.tests.util.TestUtils; import com.google.refine.tests.util.TestUtils;
import com.google.refine.util.Pool;
public class BlankDownTests extends RefineTest { public class BlankDownTests extends RefineTest {
@ -81,4 +87,31 @@ public class BlankDownTests extends RefineTest {
Assert.assertNull(project.rows.get(2).cells.get(2)); Assert.assertNull(project.rows.get(2).cells.get(2));
Assert.assertNull(project.rows.get(3).cells.get(2)); Assert.assertNull(project.rows.get(3).cells.get(2));
} }
@Test
public void testKeyColumnIndex() throws Exception {
// Shift all column indices
for(Row r : project.rows) {
r.cells.add(0, null);
}
List<Column> newColumns = new ArrayList<>();
for(Column c : project.columnModel.columns) {
newColumns.add(new Column(c.getCellIndex()+1, c.getName()));
}
project.columnModel.columns.clear();
project.columnModel.columns.addAll(newColumns);
project.columnModel.update();
AbstractOperation op = new BlankDownOperation(
EngineConfig.reconstruct(new JSONObject("{\"mode\":\"record-based\",\"facets\":[]}")),
"second");
Process process = op.createProcess(project, new Properties());
process.performImmediate();
//project.saveToOutputStream(System.out, new Pool());
Assert.assertEquals("c", project.rows.get(0).cells.get(3).value);
Assert.assertNull(project.rows.get(1).cells.get(3));
Assert.assertEquals("c", project.rows.get(2).cells.get(3).value);
Assert.assertNull(project.rows.get(3).cells.get(3));
}
} }

30
main/tests/server/src/com/google/refine/tests/operations/cell/FillDownTests.java
View File

@ -1,5 +1,7 @@
package com.google.refine.tests.operations.cell; package com.google.refine.tests.operations.cell;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import org.json.JSONException; import org.json.JSONException;
@ -13,7 +15,9 @@ import org.testng.annotations.Test;
import com.google.refine.ProjectManager; import com.google.refine.ProjectManager;
import com.google.refine.browsing.EngineConfig; import com.google.refine.browsing.EngineConfig;
import com.google.refine.model.AbstractOperation; import com.google.refine.model.AbstractOperation;
import com.google.refine.model.Column;
import com.google.refine.model.Project; import com.google.refine.model.Project;
import com.google.refine.model.Row;
import com.google.refine.operations.OperationRegistry; import com.google.refine.operations.OperationRegistry;
import com.google.refine.operations.cell.FillDownOperation; import com.google.refine.operations.cell.FillDownOperation;
import com.google.refine.tests.RefineTest; import com.google.refine.tests.RefineTest;
@ -98,4 +102,30 @@ public class FillDownTests extends RefineTest {
Assert.assertEquals("c", project.rows.get(2).cells.get(2).value); Assert.assertEquals("c", project.rows.get(2).cells.get(2).value);
Assert.assertEquals("h", project.rows.get(3).cells.get(2).value); Assert.assertEquals("h", project.rows.get(3).cells.get(2).value);
} }
@Test
public void testKeyColumnIndex() throws Exception {
// Shift all column indices
for(Row r : project.rows) {
r.cells.add(0, null);
}
List<Column> newColumns = new ArrayList<>();
for(Column c : project.columnModel.columns) {
newColumns.add(new Column(c.getCellIndex()+1, c.getName()));
}
project.columnModel.columns.clear();
project.columnModel.columns.addAll(newColumns);
project.columnModel.update();
AbstractOperation op = new FillDownOperation(
EngineConfig.reconstruct(new JSONObject("{\"mode\":\"record-based\",\"facets\":[]}")),
"second");
Process process = op.createProcess(project, new Properties());
process.performImmediate();
Assert.assertEquals("c", project.rows.get(0).cells.get(3).value);
Assert.assertEquals("c", project.rows.get(1).cells.get(3).value);
Assert.assertNull(project.rows.get(2).cells.get(3));
Assert.assertEquals("h", project.rows.get(3).cells.get(3).value);
}
} }