Skip to content

Commit 5dcdf39

Browse files
committed
fix updateby gen
1 parent 19a4a97 commit 5dcdf39

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/fill/BooleanFillByOperator.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.deephaven.engine.table.impl.sources.BooleanArraySource;
1414
import io.deephaven.engine.table.impl.sources.BooleanSparseArraySource;
1515
import io.deephaven.engine.table.WritableColumnSource;
16+
import io.deephaven.util.BooleanUtils;
1617

1718
import io.deephaven.base.verify.Assert;
1819
import io.deephaven.chunk.ByteChunk;
@@ -21,10 +22,8 @@
2122
import io.deephaven.engine.table.impl.MatchPair;
2223
import io.deephaven.engine.table.impl.updateby.UpdateByOperator;
2324
import io.deephaven.engine.table.impl.updateby.internal.BaseByteUpdateByOperator;
24-
import io.deephaven.util.BooleanUtils;
2525
import org.jetbrains.annotations.NotNull;
2626

27-
import static io.deephaven.util.BooleanUtils.NULL_BOOLEAN_AS_BYTE;
2827

2928
public class BooleanFillByOperator extends BaseByteUpdateByOperator {
3029
// region extra-fields
@@ -47,7 +46,7 @@ public void push(int pos, int count) {
4746
Assert.eq(count, "push count", 1);
4847

4948
byte val = booleanValueChunk.get(pos);
50-
if (!BooleanUtils.isNull(val)) {
49+
if(BooleanUtils.isNull(val)) {
5150
curVal = val;
5251
}
5352
}
@@ -81,7 +80,7 @@ public UpdateByOperator.Context makeUpdateContext(final int affectedChunkSize, f
8180
// region extra-methods
8281
@Override
8382
protected byte getNullValue() {
84-
return NULL_BOOLEAN_AS_BYTE;
83+
return BooleanUtils.NULL_BOOLEAN_AS_BYTE;
8584
}
8685
@Override
8786
protected WritableColumnSource<Byte> makeSparseSource() {

replication/static/src/main/java/io/deephaven/replicators/ReplicateUpdateBy.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,14 @@ private static void fixupByteBase(String byteResult) throws IOException {
326326
private static void fixupBoolean(String boolResult) throws IOException {
327327
final File objectFile = new File(boolResult);
328328
List<String> lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
329+
lines = removeImport(lines, "import static io.deephaven.util.QueryConstants.NULL_BOOLEAN;");
329330
lines = addImport(lines, "import io.deephaven.engine.table.ColumnSource;",
330331
"import java.util.Map;",
331332
"import java.util.Collections;",
332333
"import io.deephaven.engine.table.impl.sources.BooleanArraySource;",
333334
"import io.deephaven.engine.table.impl.sources.BooleanSparseArraySource;",
334-
"import io.deephaven.engine.table.WritableColumnSource;");
335+
"import io.deephaven.engine.table.WritableColumnSource;",
336+
"import io.deephaven.util.BooleanUtils;");
335337

336338
lines = globalReplacements(lines,
337339
"BaseBooleanUpdateByOperator", "BaseByteUpdateByOperator",
@@ -343,14 +345,13 @@ private static void fixupBoolean(String boolResult) throws IOException {
343345
"boolean previousVal", "byte previousVal",
344346
"boolean currentVal", "byte currentVal",
345347
"BooleanChunk", "ByteChunk",
346-
"NULL_BOOLEAN", "NULL_BOOLEAN_AS_BYTE");
347-
lines = globalReplacements(lines,
348-
"!BooleanPrimitives\\.isNull\\(currentVal\\)", "currentVal != NULL_BOOLEAN_AS_BYTE");
348+
"val != NULL_BOOLEAN", "BooleanUtils.isNull(val)"
349+
);
349350
lines = replaceRegion(lines, "extra-methods",
350351
Collections.singletonList(
351352
" @Override\n" +
352353
" protected byte getNullValue() {\n" +
353-
" return NULL_BOOLEAN_AS_BYTE;\n" +
354+
" return BooleanUtils.NULL_BOOLEAN_AS_BYTE;\n" +
354355
" }\n" +
355356
" @Override\n" +
356357
" protected WritableColumnSource<Byte> makeSparseSource() {\n" +

0 commit comments

Comments
 (0)