From a2e1880aed5e62b44e15a2ac47a99baade75e9ed Mon Sep 17 00:00:00 2001
From: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
Date: Mon, 30 Oct 2023 20:51:16 +0530
Subject: [PATCH] Disable sort optimization for HALF_FLOAT (#10999)

Signed-off-by: Chaitanya Gohel <gashutos@amazon.com>
---
 CHANGELOG.md                                                  | 4 +++-
 .../org/opensearch/index/fielddata/IndexNumericFieldData.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ce0aef351587..16773aa69877c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Removed
 
 ### Fixed
+- [BUG] Disable sort optimization for HALF_FLOAT ([#10999](https://github.com/opensearch-project/OpenSearch/pull/10999))
 
 ### Security
 
-[Unreleased 2.11]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.11
\ No newline at end of file
+[Unreleased 2.11]: https://github.com/opensearch-project/OpenSearch/compare/2.11...2.11
+
diff --git a/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java b/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java
index b4e90b8ab570a..6fc074fe0de95 100644
--- a/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java
+++ b/server/src/main/java/org/opensearch/index/fielddata/IndexNumericFieldData.java
@@ -242,7 +242,7 @@ private XFieldComparatorSource comparatorSource(
                 assert !targetNumericType.isFloatingPoint();
                 source = new IntValuesComparatorSource(this, missingValue, sortMode, nested);
         }
-        if (targetNumericType != getNumericType()) {
+        if (targetNumericType != getNumericType() || getNumericType() == NumericType.HALF_FLOAT) {
             source.disableSkipping(); // disable skipping logic for cast of sort field
         }
         return source;