/*
 * Licensed 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 io.trino.plugin.tpch.util;

import com.google.common.collect.ImmutableMap;
import io.trino.plugin.tpch.TpchColumnHandle;
import io.trino.spi.connector.ColumnHandle;
import io.trino.spi.predicate.NullableValue;
import io.trino.spi.predicate.TupleDomain;

import java.util.function.Predicate;

public final class PredicateUtils
{
    private PredicateUtils() {}

    public static Predicate<NullableValue> convertToPredicate(TupleDomain<ColumnHandle> predicate, TpchColumnHandle columnHandle)
    {
        TupleDomain<ColumnHandle> columnPredicate = filterColumns(predicate, columnHandle::equals);
        return nullableValue -> columnPredicate.contains(TupleDomain.fromFixedValues(ImmutableMap.of(columnHandle, nullableValue)));
    }

    public static TupleDomain<ColumnHandle> filterOutColumnFromPredicate(TupleDomain<ColumnHandle> predicate, TpchColumnHandle columnHandle)
    {
        return filterColumns(predicate, tpchColumnHandle -> !tpchColumnHandle.equals(columnHandle));
    }

    public static TupleDomain<ColumnHandle> filterColumns(TupleDomain<ColumnHandle> predicate, Predicate<TpchColumnHandle> filterPredicate)
    {
        return predicate.filter((columnHandle, domain) -> filterPredicate.test((TpchColumnHandle) columnHandle));
    }
}

@@ -595,55 +595,8 @@
 l;%0A%0A
-import com.google.common.collect.ImmutableMap;%0A
 impo
@@ -629,32 +629,32 @@
 chColumnHandle;%0A
+
 import io.trino.
@@ -673,32 +673,70 @@
 r.ColumnHandle;%0A
+import io.trino.spi.predicate.Domain;%0A
 import io.trino.
@@ -1063,100 +1063,229 @@
     
-Tuple
 Domain
-%3CC
+ c
 olumn
-Handle%3E columnPredicate = filterColumns(predicate, columnHandle::equals
+Domain = predicate.getDomains()%0A                .map(domains -%3E domains.getOrDefault(columnHandle, Domain.all(columnHandle.getType())))%0A                .orElseGet(() -%3E Domain.none(columnHandle.getType())
 );%0A
+%0A
     
@@ -1322,85 +1322,37 @@
 lumn
-Predicate.contains(TupleDomain.fromFixedVa
+Domain.inc
 lu
+d
 es
-(ImmutableMap.of(columnHandle, 
+NullableValue(
 null
@@ -1360,17 +1360,26 @@
 bleValue
-)
+.getValue(
 ));%0A    
@@ -1633,37 +1633,38 @@
 ));%0A    %7D%0A%0A    p
-ublic
+rivate
  static TupleDom

Simplify tpch's convertToPredicate