This is an automated email from the ASF dual-hosted git repository. nehapawar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push: new 94c695f Remove prefetch query option, since the whole prefetch-acquire-release is already withing an instance option (#7352) 94c695f is described below commit 94c695f1a466baf81e54d7dcb7b7149b42718182 Author: Neha Pawar <neha.pawa...@gmail.com> AuthorDate: Mon Aug 23 15:54:45 2021 -0700 Remove prefetch query option, since the whole prefetch-acquire-release is already withing an instance option (#7352) --- .../org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java | 6 +----- .../src/main/java/org/apache/pinot/core/util/QueryOptions.java | 4 ---- .../src/main/java/org/apache/pinot/spi/utils/CommonConstants.java | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java index 52a9a24..1d48cc1 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/plan/maker/InstancePlanMakerImplV2.java @@ -152,8 +152,6 @@ public class InstancePlanMakerImplV2 implements PlanMaker { List<PlanNode> planNodes = new ArrayList<>(indexSegments.size()); if (_enableBufferAcquireRelease) { - boolean prefetch = - queryContext.getQueryOptions() != null && QueryOptions.isPrefetchBuffers(queryContext.getQueryOptions()); List<ExpressionContext> selectExpressions = queryContext.getSelectExpressions(); for (IndexSegment indexSegment : indexSegments) { Set<String> columns; @@ -162,9 +160,7 @@ public class InstancePlanMakerImplV2 implements PlanMaker { } else { columns = queryContext.getColumns(); } - if (prefetch) { - indexSegment.prefetch(columns); - } + indexSegment.prefetch(columns); planNodes.add( new AcquireReleaseColumnsSegmentPlanNode(makeSegmentPlanNode(indexSegment, queryContext), indexSegment, columns)); diff --git a/pinot-core/src/main/java/org/apache/pinot/core/util/QueryOptions.java b/pinot-core/src/main/java/org/apache/pinot/core/util/QueryOptions.java index 2804cab..9246dac 100644 --- a/pinot-core/src/main/java/org/apache/pinot/core/util/QueryOptions.java +++ b/pinot-core/src/main/java/org/apache/pinot/core/util/QueryOptions.java @@ -98,8 +98,4 @@ public class QueryOptions { String minServerGroupTrimSizeString = queryOptions.get(Request.QueryOptionKey.MIN_SERVER_GROUP_TRIM_SIZE); return minServerGroupTrimSizeString != null ? Integer.parseInt(minServerGroupTrimSizeString) : null; } - - public static boolean isPrefetchBuffers(Map<String, String> queryOptions) { - return Boolean.parseBoolean(queryOptions.get(Request.QueryOptionKey.PREFETCH_BUFFERS)); - } } diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java index a1189c1..2bc0de8 100644 --- a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java +++ b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/CommonConstants.java @@ -230,7 +230,6 @@ public class CommonConstants { public static final String SKIP_UPSERT = "skipUpsert"; public static final String MIN_SEGMENT_GROUP_TRIM_SIZE = "minSegmentGroupTrimSize"; public static final String MIN_SERVER_GROUP_TRIM_SIZE = "minServerGroupTrimSize"; - public static final String PREFETCH_BUFFERS = "prefetchBuffers"; } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org