/*
 * 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.hive;

import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.trino.plugin.hive.util.HiveBucketing.BucketingVersion;
import io.trino.spi.connector.ConnectorPartitioningHandle;

import java.util.List;
import java.util.Objects;
import java.util.OptionalInt;

import static com.google.common.base.MoreObjects.toStringHelper;
import static java.util.Objects.requireNonNull;

public class HivePartitioningHandle
        implements ConnectorPartitioningHandle
{
    private final BucketingVersion bucketingVersion;
    private final int bucketCount;
    private final List<HiveType> hiveTypes;
    private final OptionalInt maxCompatibleBucketCount;
    private final boolean usePartitionedBucketing;

    @JsonCreator
    public HivePartitioningHandle(
            @JsonProperty("bucketingVersion") BucketingVersion bucketingVersion,
            @JsonProperty("bucketCount") int bucketCount,
            @JsonProperty("hiveBucketTypes") List<HiveType> hiveTypes,
            @JsonProperty("maxCompatibleBucketCount") OptionalInt maxCompatibleBucketCount,
            @JsonProperty("usePartitionedBucketing") boolean usePartitionedBucketing)
    {
        this.bucketingVersion = requireNonNull(bucketingVersion, "bucketingVersion is null");
        this.bucketCount = bucketCount;
        this.hiveTypes = requireNonNull(hiveTypes, "hiveTypes is null");
        this.maxCompatibleBucketCount = maxCompatibleBucketCount;
        this.usePartitionedBucketing = usePartitionedBucketing;
    }

    @JsonProperty
    public BucketingVersion getBucketingVersion()
    {
        return bucketingVersion;
    }

    @JsonProperty
    public int getBucketCount()
    {
        return bucketCount;
    }

    @JsonProperty
    public List<HiveType> getHiveTypes()
    {
        return hiveTypes;
    }

    @JsonProperty
    public OptionalInt getMaxCompatibleBucketCount()
    {
        return maxCompatibleBucketCount;
    }

    @JsonProperty
    public boolean isUsePartitionedBucketing()
    {
        return usePartitionedBucketing;
    }

    @Override
    public String toString()
    {
        return toStringHelper(this)
                .add("buckets", bucketCount)
                .add("hiveTypes", hiveTypes)
                .add("usePartitionedBucketing", usePartitionedBucketing)
                .toString();
    }

    @Override
    public boolean equals(Object o)
    {
        if (this == o) {
            return true;
        }
        if (o == null || getClass() != o.getClass()) {
            return false;
        }
        HivePartitioningHandle that = (HivePartitioningHandle) o;
        return bucketCount == that.bucketCount &&
                usePartitionedBucketing == that.usePartitionedBucketing &&
                Objects.equals(hiveTypes, that.hiveTypes);
    }

    @Override
    public int hashCode()
    {
        return Objects.hash(bucketCount, hiveTypes, usePartitionedBucketing);
    }
}

@@ -693,16 +693,74 @@
 operty;%0A
+import com.google.common.base.MoreObjects.ToStringHelper;%0A
 import i
@@ -2788,22 +2788,39 @@
         
-return
+ToStringHelper helper =
  toStrin
@@ -2922,16 +2922,17 @@
 veTypes)
+;
 %0A       
@@ -2928,32 +2928,73 @@
 s);%0A        
-        
+if (usePartitionedBucketing) %7B%0A            helper
 .add(%22usePar
@@ -3033,24 +3033,25 @@
 edBucketing)
+;
 %0A           
@@ -3047,24 +3047,26 @@
         
+%7D%0A
         
 .toStrin
@@ -3057,16 +3057,29 @@
         
+return helper
 .toStrin

Print usePartitionedBucketing only when it's set to true