SQL: Fix column size for IP data type (#53056)

Set size/displaySize to 45 which is the maximum string for an IP (v6), since IPs are returned as strings. Fixes: #52762 (cherry picked from commit 815f017)
elastic · Mar 4, 2020 · 1d5c842 · 1d5c842
1 parent 4b528d9
commit 1d5c842
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 99 deletions.
diff --git a/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/type/DataTypes.java b/x-pack/plugin/ql/src/main/java/org/elasticsearch/xpack/ql/type/DataTypes.java
@@ -41,7 +41,7 @@ public final class DataTypes {
     // date
     public static final DataType DATETIME     = new DataType("DATETIME", "date",  Long.BYTES,        false, false, true);
     // ip
-    public static final DataType IP           = new DataType("ip",                39,                false, false, true);
+    public static final DataType IP           = new DataType("ip",                45,                false, false, true);
     // binary
     public static final DataType BINARY       = new DataType("binary",            Integer.MAX_VALUE, false, false, true);
     // complex types
@@ -164,4 +164,4 @@ public static boolean areCompatible(DataType left, DataType right) {
                     || (left == DATETIME && right == DATETIME);
         }
     }
-}
+}
diff --git a/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java b/x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java
@@ -87,9 +87,9 @@ public void testDateTimes() throws IOException {
     }
 
     public void testIPs() throws IOException {
-        assertQuery("SELECT CAST('12.13.14.15' AS IP)", "CAST('12.13.14.15' AS IP)", "ip", "12.13.14.15", 0);
+        assertQuery("SELECT CAST('12.13.14.15' AS IP)", "CAST('12.13.14.15' AS IP)", "ip", "12.13.14.15", 45);
         assertQuery("SELECT CAST('2001:0db8:0000:0000:0000:ff00:0042:8329' AS IP)", "CAST('2001:0db8:0000:0000:0000:ff00:0042:8329' AS IP)",
-                "ip", "2001:0db8:0000:0000:0000:ff00:0042:8329", 0);
+                "ip", "2001:0db8:0000:0000:0000:ff00:0042:8329", 45);
     }
 
     public void testDateTimeIntervals() throws IOException {