rdblue commented on code in PR #6622: URL: https://github.com/apache/iceberg/pull/6622#discussion_r1093834615
########## api/src/main/java/org/apache/iceberg/expressions/CountNonNull.java: ########## @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.iceberg.expressions; + +import org.apache.iceberg.DataFile; +import org.apache.iceberg.StructLike; +import org.apache.iceberg.types.Types; + +public class CountNonNull<T> extends CountAggregate<T> { + private final int fieldId; + private final Types.NestedField field; + + protected CountNonNull(BoundTerm<T> term) { + super(Operation.COUNT, term); + this.field = term.ref().field(); + this.fieldId = field.fieldId(); + } + + @Override + protected Long countFor(StructLike row) { + return term().eval(row) != null ? 1L : 0L; + } + + @Override + protected Long countFor(DataFile file) { + if (field.type().isNestedType()) { + return file.recordCount(); + } + + // NaN value counts were not required in v1 and were included in value counts Review Comment: You're right that we need to subtract the null values, since NaN and null are included: > Map from column id to number of values in the column (including null and NaN values) I think I was also wrong to add the NaN values in, because they are included in both v1 and v2. So we should remove the addition of NaN count. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
