add more sort tests

modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHit.java

@@ -110,6 +110,8 @@ public interface SearchHit extends Streamable, ToXContent, Iterable<SearchHitFie
      */
     Explanation getExplanation();
 
+    public SearchHitField field(String fieldName);
+
     /**
      * A map of hit fields (from field name to hit fields) if additional fields
      * were required to be loaded.

modules/elasticsearch/src/main/java/org/elasticsearch/search/SearchHitField.java

@@ -41,6 +41,16 @@ public interface SearchHitField extends Streamable, Iterable<Object> {
      */
     String getName();
 
+    /**
+     * The first value of the hit.
+     */
+    Object value();
+
+    /**
+     * The first value of the hit.
+     */
+    Object getValue();
+
     /**
      * The field values.
      */

modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java

@@ -167,6 +167,10 @@ public class InternalSearchHit implements SearchHit {
         return fields.values().iterator();
     }
 
+    @Override public SearchHitField field(String fieldName) {
+        return fields().get(fieldName);
+    }
+
     @Override public Map<String, SearchHitField> fields() {
         return fields;
     }

modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/InternalSearchHitField.java

@@ -55,6 +55,17 @@ public class InternalSearchHitField implements SearchHitField {
         return name();
     }
 
+    @Override public Object value() {
+        if (values == null || values.isEmpty()) {
+            return null;
+        }
+        return values.get(0);
+    }
+
+    @Override public Object getValue() {
+        return value();
+    }
+
     public List<Object> values() {
         return values;
     }

modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/facets/SimpleFacetsTests.yml

@@ -5,5 +5,3 @@ index:
   number_of_shards: 3
   number_of_replicas: 0
   routing :
-    # Use simple hashing since we want even distribution and our ids are simple incremented number based
-    hash.type : simple

modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java

@@ -0,0 +1,143 @@
+/*
+ * Licensed to Elastic Search and Shay Banon under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. Elastic Search licenses this
+ * file to you 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 org.elasticsearch.test.integration.search.sort;
+
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.test.integration.AbstractNodesTests;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import static org.elasticsearch.common.xcontent.XContentFactory.*;
+import static org.elasticsearch.index.query.xcontent.QueryBuilders.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.Matchers.*;
+
+/**
+ * @author kimchy (shay.banon)
+ */
+public class SimpleSortTests extends AbstractNodesTests {
+
+    private Client client;
+
+    @BeforeClass public void createNodes() throws Exception {
+        startNode("server1");
+        startNode("server2");
+        client = getClient();
+    }
+
+    @AfterClass public void closeNodes() {
+        client.close();
+        closeAllNodes();
+    }
+
+    protected Client getClient() {
+        return client("server1");
+    }
+
+    @Test public void testSimpleSorts() throws Exception {
+        try {
+            client.admin().indices().prepareDelete("test").execute().actionGet();
+        } catch (Exception e) {
+            // ignore
+        }
+        client.admin().indices().prepareCreate("test").execute().actionGet();
+        client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
+
+        client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
+                .field("id", "1")
+                .field("svalue", "aaa")
+                .field("ivalue", 100)
+                .field("dvalue", 0.1)
+                .endObject()).execute().actionGet();
+
+        client.prepareIndex("test", "type1").setSource(jsonBuilder().startObject()
+                .field("id", "2")
+                .field("svalue", "bbb")
+                .field("ivalue", 200)
+                .field("dvalue", 0.2)
+                .endObject()).execute().actionGet();
+
+        client.admin().indices().prepareFlush().setRefresh(true).execute().actionGet();
+
+        SearchResponse searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("svalue", SearchSourceBuilder.Order.ASC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("2"));
+
+        searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("svalue", SearchSourceBuilder.Order.DESC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("2"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("1"));
+
+
+        searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("ivalue", SearchSourceBuilder.Order.ASC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("2"));
+
+        searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("ivalue", SearchSourceBuilder.Order.DESC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("2"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("1"));
+
+        searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("dvalue", SearchSourceBuilder.Order.ASC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("1"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("2"));
+
+        searchResponse = client.prepareSearch()
+                .setQuery(matchAllQuery())
+                .addScriptField("id", "doc['id'].value")
+                .addSort("dvalue", SearchSourceBuilder.Order.DESC)
+                .execute().actionGet();
+
+        assertThat(searchResponse.hits().getTotalHits(), equalTo(2l));
+        assertThat((String) searchResponse.hits().getAt(0).field("id").value(), equalTo("2"));
+        assertThat((String) searchResponse.hits().getAt(1).field("id").value(), equalTo("1"));
+    }
+}

modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.yml

@@ -0,0 +1,7 @@
+cluster:
+  routing:
+    schedule: 100ms
+index:
+  number_of_shards: 3
+  number_of_replicas: 0
+  routing :