From 06d0e0efad00d6ec7bf9e0103881692bddb3b4a1 Mon Sep 17 00:00:00 2001
From: Andrei Stefan <astefan@users.noreply.github.com>
Date: Fri, 1 Mar 2019 15:23:38 +0200
Subject: [PATCH] Removed custom naming for DISTINCT COUNT (#39537)

(cherry picked from commit 9412a2ee01a60dd6449bbced1273ec0b37b65589)
---
 x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec   |  4 ++++
 .../xpack/sql/expression/function/aggregate/Count.java | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
index 7406ea48830..9ed20b1cbc1 100644
--- a/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
+++ b/x-pack/plugin/sql/qa/src/main/resources/agg.sql-spec
@@ -89,6 +89,8 @@ SELECT (emp_no % 3) + 1 AS e, (languages % 3) + 1 AS l FROM test_emp GROUP BY e,
 
 // COUNT
 aggCountImplicit
+SELECT COUNT(*) FROM test_emp;
+aggCountImplicitAlias
 SELECT COUNT(*) AS count FROM test_emp;
 aggCountImplicitWithCast
 SELECT CAST(COUNT(*) AS INT) c FROM "test_emp";
@@ -109,6 +111,8 @@ SELECT gender g, CAST(COUNT(*) AS INT) c FROM "test_emp" WHERE emp_no < 10020 GR
 aggCountWithAlias
 SELECT gender g, COUNT(*) c FROM "test_emp" GROUP BY g ORDER BY gender;
 countDistinct
+SELECT COUNT(DISTINCT "hire_date") FROM test_emp;
+countDistinctAlias
 SELECT COUNT(DISTINCT hire_date) AS count FROM test_emp;
 countDistinctAndCountSimpleWithAlias
 SELECT COUNT(*) cnt, COUNT(DISTINCT first_name) as names, gender FROM test_emp GROUP BY gender ORDER BY gender;
diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/Count.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/Count.java
index 95a1b50cc11..236cf105a4c 100644
--- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/Count.java
+++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/function/aggregate/Count.java
@@ -63,16 +63,6 @@ public class Count extends AggregateFunction {
         return functionId;
     }
 
-    @Override
-    public String name() {
-        if (distinct()) {
-            StringBuilder sb = new StringBuilder(super.name());
-            sb.insert(sb.indexOf("(") + 1, "DISTINCT ");
-            return sb.toString();
-        }
-        return super.name();
-    }
-
     @Override
     public AggregateFunctionAttribute toAttribute() {
         // COUNT(*) gets its value from the parent aggregation on which _count is called