From a1359a61fff75dbfabc1888f27a8e3d276d3f2ff Mon Sep 17 00:00:00 2001 From: cecemei Date: Fri, 10 Jan 2025 12:49:33 -0800 Subject: [PATCH] revert change in SegmentMetadataQuery style change --- .../query/metadata/metadata/SegmentMetadataQuery.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java index 09881b87e123..e0e5f81f45f3 100644 --- a/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java +++ b/processing/src/main/java/org/apache/druid/query/metadata/metadata/SegmentMetadataQuery.java @@ -74,7 +74,7 @@ public static AnalysisType fromString(String name) @Override public byte[] getCacheKey() { - return new byte[]{(byte) this.ordinal()}; + return new byte[] {(byte) this.ordinal()}; } } @@ -116,12 +116,9 @@ public SegmentMetadataQuery( // of truth for consumers of this class variable. The defaults are to preserve backwards compatibility. // In a future release, 28.0+, we can remove the deprecated property lenientAggregatorMerge. if (lenientAggregatorMerge != null && aggregatorMergeStrategy != null) { - throw InvalidInput.exception( - "Both lenientAggregatorMerge [%s] and aggregatorMergeStrategy [%s] parameters cannot be set." - + " Consider using aggregatorMergeStrategy since lenientAggregatorMerge is deprecated.", - lenientAggregatorMerge, - aggregatorMergeStrategy - ); + throw InvalidInput.exception("Both lenientAggregatorMerge [%s] and aggregatorMergeStrategy [%s] parameters cannot be set." + + " Consider using aggregatorMergeStrategy since lenientAggregatorMerge is deprecated.", + lenientAggregatorMerge, aggregatorMergeStrategy); } if (lenientAggregatorMerge != null) { this.aggregatorMergeStrategy = lenientAggregatorMerge