From 7ad804fa52d19a92f17d964693c909a377771c71 Mon Sep 17 00:00:00 2001
From: Adrien Grand <jpountz@gmail.com>
Date: Thu, 7 Apr 2016 17:40:03 +0200
Subject: [PATCH] Remove MappedFieldType.isSortable(). #17598

It is not really needed.
---
 .../org/elasticsearch/index/mapper/MappedFieldType.java     | 6 +-----
 .../index/mapper/core/CompletionFieldMapper.java            | 5 -----
 .../org/elasticsearch/search/sort/FieldSortBuilder.java     | 4 ----
 .../search/suggest/CompletionSuggestSearchIT.java           | 4 ++--
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
index 7da1005794c..aaea9acd065 100644
--- a/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
+++ b/core/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java
@@ -99,7 +99,7 @@ public abstract class MappedFieldType extends FieldType {
 
     /** Return a fielddata builder for this field. */
     public IndexFieldData.Builder fielddataBuilder() {
-        throw new IllegalArgumentException("Fielddata is not supported on fields of type [" + typeName() + "]");
+        throw new IllegalArgumentException("Fielddata is not supported on field [" + name() + "] of type [" + typeName() + "]");
     }
 
     @Override
@@ -222,10 +222,6 @@ public abstract class MappedFieldType extends FieldType {
         }
     }
 
-    public boolean isSortable() {
-        return true;
-    }
-
     public String name() {
         return name;
     }
diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
index c0b9173cea0..1076d655d11 100644
--- a/core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
+++ b/core/src/main/java/org/elasticsearch/index/mapper/core/CompletionFieldMapper.java
@@ -344,11 +344,6 @@ public class CompletionFieldMapper extends FieldMapper implements ArrayValueMapp
             return value.toString();
         }
 
-        @Override
-        public boolean isSortable() {
-            return false;
-        }
-
     }
 
     /**
diff --git a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
index 74a5aa409ce..21acd2b6c45 100644
--- a/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
+++ b/core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
@@ -263,10 +263,6 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
                 }
             }
 
-            if (!fieldType.isSortable()) {
-                throw new QueryShardException(context, "Sorting not supported for field[" + fieldName + "]");
-            }
-
             MultiValueMode localSortMode = null;
             if (sortMode != null) {
                 localSortMode = MultiValueMode.fromString(sortMode.toString());
diff --git a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
index a18b15f0fc5..a5f0d4a42de 100644
--- a/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
+++ b/core/src/test/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java
@@ -834,7 +834,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
             fail("Expected an exception due to trying to sort on completion field, but did not happen");
         } catch (SearchPhaseExecutionException e) {
             assertThat(e.status().getStatus(), is(400));
-            assertThat(e.toString(), containsString("Sorting not supported for field[" + FIELD + "]"));
+            assertThat(e.toString(), containsString("Fielddata is not supported on field [" + FIELD + "] of type [completion]"));
         }
     }
 
@@ -1114,7 +1114,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase {
             // Exception must be thrown
             assertFalse(true);
         } catch (SearchPhaseExecutionException e) {
-            assertThat(e.toString(), containsString("Fielddata is not supported on fields of type [completion]"));
+            assertThat(e.toString(), containsString("Fielddata is not supported on field [" + FIELD + "] of type [completion]"));
         }
     }