Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions gortools/src/main/scala/gorsat/Analysis/ReplaceAnalysis.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,20 @@ case class ReplaceAnalysis(context: GorContext, executeNor: Boolean, paramString
}

override def process(r: Row): Unit = {
val cvp = ReplaceCvp(r)
try {
val columnValues = columnsToReplace.indices.map(i => {
cvp.replaceCol = columnsToReplace(i)
val exIx = if(i > expressions.length - 1) 0 else i
evalFunction(cvp, expressions(exIx), expressionTypes(exIx))
})
r.setColumns(columnsToReplace, columnValues.toArray)
} catch {
case e: GorParsingException =>
val msg = s"Error in step: REPLACE $paramString\n${e.getMessage}"
throw new GorDataException(msg, -1, header, r.getAllCols.toString, e)
if (!columnsToReplace.isEmpty) {
val cvp = ReplaceCvp(r)
try {
val columnValues = columnsToReplace.indices.map(i => {
cvp.replaceCol = columnsToReplace(i)
val exIx = if (i > expressions.length - 1) 0 else i
evalFunction(cvp, expressions(exIx), expressionTypes(exIx))
})
r.setColumns(columnsToReplace, columnValues.toArray)
} catch {
case e: GorParsingException =>
val msg = s"Error in step: REPLACE $paramString\n${e.getMessage}"
throw new GorDataException(msg, -1, header, r.getAllCols.toString, e)
}
}
super.process(r)
}
Expand Down
2 changes: 1 addition & 1 deletion gortools/src/main/scala/gorsat/Commands/Replace.scala
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Replace extends CommandInfo("REPLACE",
val colNums = columnsFromHeader(colName, forcedInputHeader, executeNor).toArray

val filteredColNums = colNums.filter(i => i>= 2)
if(filteredColNums.isEmpty) {
if(!colNums.isEmpty && filteredColNums.isEmpty) {
throw new GorParsingException("REPLACE is not allowed on Chrom/Pos columns")
}
CommandParsingResult(ReplaceAnalysis(context, executeNor, formula, forcedInputHeader, filteredColNums), forcedInputHeader)
Expand Down
9 changes: 9 additions & 0 deletions gortools/src/test/java/gorsat/UTestReplace.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,13 @@ public void replaceStarWhenUsingNor() {
"chrN\t0\t42\t42\t42\t42\n";
Assert.assertEquals(expected, res);
}

@Test
public void replaceNoExistingColumns() {
String query = "gorrow chr1,1 " +
"| replace Foo_* if(#rc='0','wt',#rc)";
String result = TestUtils.runGorPipe(query);
Assert.assertEquals("chrom\tpos\nchr1\t1\n", result);
}

}
Loading