From 5d1af2b29d9b2357665f1315871967be987aee86 Mon Sep 17 00:00:00 2001 From: Kris De Schutter Date: Wed, 30 Jan 2019 12:03:48 +0100 Subject: [PATCH 1/2] [Contradictory type checks](https://lgtm.com/projects/g/elastic/elasticsearch/snapshot/dist-1916470085-1548143539391/files/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java#xa88ea97f7b1036f1:1) --- .../elasticsearch/xpack/sql/planner/QueryTranslator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java index de529b2e4ca61..c422acb7423a3 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java @@ -419,12 +419,12 @@ static String nameOf(Expression e) { if (e instanceof DateTimeFunction) { return nameOf(((DateTimeFunction) e).field()); } - if (e instanceof NamedExpression) { - return ((NamedExpression) e).name(); - } if (e instanceof Literal) { return String.valueOf(e.fold()); } + if (e instanceof NamedExpression) { + return ((NamedExpression) e).name(); + } throw new SqlIllegalArgumentException("Cannot determine name for {}", e); } From fb97914bf00634af12bc0cf956439cb3eb8548d5 Mon Sep 17 00:00:00 2001 From: Kris De Schutter Date: Tue, 26 Feb 2019 07:59:47 +0100 Subject: [PATCH 2/2] Remove the Literal check. --- .../org/elasticsearch/xpack/sql/planner/QueryTranslator.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java index c422acb7423a3..91fde8e7c4786 100644 --- a/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java +++ b/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/planner/QueryTranslator.java @@ -419,9 +419,6 @@ static String nameOf(Expression e) { if (e instanceof DateTimeFunction) { return nameOf(((DateTimeFunction) e).field()); } - if (e instanceof Literal) { - return String.valueOf(e.fold()); - } if (e instanceof NamedExpression) { return ((NamedExpression) e).name(); }