[phoenix] branch 4.x-HBase-1.3 updated: PHOENIX-5416: Fix Array2IT testArrayRefToLiteral

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chinmayskulkarni pushed a commit to branch 4.x-HBase-1.3
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x-HBase-1.3 by this push:
     new f88dbf0  PHOENIX-5416: Fix Array2IT testArrayRefToLiteral
f88dbf0 is described below

commit f88dbf008b0c3154e3282af46ccbd2fe5f23916e
Author: Chinmay Kulkarni <ch...@gmail.com>
AuthorDate: Tue Aug 6 14:39:44 2019 -0700

    PHOENIX-5416: Fix Array2IT testArrayRefToLiteral
---
 .../java/org/apache/phoenix/end2end/Array2IT.java  | 46 +++++++++++++++++++---
 .../phoenix/expression/LiteralExpression.java      | 11 ++++++
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java
index 0cb60c2..9386cde 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/Array2IT.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.end2end;
 
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -37,10 +38,12 @@ import org.apache.phoenix.schema.types.PhoenixArray;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class Array2IT extends ArrayIT {
+
+    private static final String TEST_QUERY = "select ?[2] from \"SYSTEM\".\"CATALOG\" limit 1";
+
     @Test
     public void testFixedWidthCharArray() throws Exception {
         Connection conn;
@@ -670,12 +673,12 @@ public class Array2IT extends ArrayIT {
 
     }
 
-    @Test // see PHOENIX-5416
-    @Ignore
-    public void testArrayRefToLiteral() throws Exception {
+    @Test
+    public void testArrayRefToLiteralCharArraySameLengths() throws Exception {
         Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
         try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
-            PreparedStatement stmt = conn.prepareStatement("select ?[2] from \"SYSTEM\".\"CATALOG\" limit 1");
+            PreparedStatement stmt = conn.prepareStatement(TEST_QUERY);
+            // Test with each element of the char array having same lengths
             Array array = conn.createArrayOf("CHAR", new String[] {"a","b","c"});
             stmt.setArray(1, array);
             ResultSet rs = stmt.executeQuery();
@@ -684,6 +687,39 @@ public class Array2IT extends ArrayIT {
             assertFalse(rs.next());
         }
     }
+
+    @Test
+    public void testArrayRefToLiteralCharArrayDiffLengths() throws Exception {
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+        try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+            PreparedStatement stmt = conn.prepareStatement(TEST_QUERY);
+            // Test with each element of the char array having different lengths
+            Array array = conn.createArrayOf("CHAR", new String[] {"a","bb","ccc"});
+            stmt.setArray(1, array);
+            ResultSet rs = stmt.executeQuery();
+            assertTrue(rs.next());
+            assertEquals("bb", rs.getString(1));
+            assertFalse(rs.next());
+        }
+    }
+
+    @Test
+    public void testArrayRefToLiteralBinaryArray() throws Exception {
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+        try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+            PreparedStatement stmt = conn.prepareStatement(TEST_QUERY);
+            // Test with each element of the binary array having different lengths
+            byte[][] bytes = {{0,0,1}, {0,0,2,0}, {0,0,0,3,4}};
+            Array array = conn.createArrayOf("BINARY", bytes);
+            stmt.setArray(1, array);
+            ResultSet rs = stmt.executeQuery();
+            assertTrue(rs.next());
+            // Note that all elements are padded to be of the same length
+            // as the longest element of the byte array
+            assertArrayEquals(new byte[] {0,0,2,0,0}, rs.getBytes(1));
+            assertFalse(rs.next());
+        }
+    }
     
     @Test
     public void testArrayConstructorWithMultipleRows1() throws Exception {
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/LiteralExpression.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/LiteralExpression.java
index 110177a..de15164 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/expression/LiteralExpression.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/LiteralExpression.java
@@ -338,6 +338,17 @@ public class LiteralExpression extends BaseTerminalExpression {
 
     @Override
     public Integer getMaxLength() {
+        // For literals representing arrays of CHAR or BINARY, the byte size is null and the max
+        // length of the expression is also null, so we must get the max length of the
+        // actual underlying array
+        if (maxLength == null && getDataType() != null && getDataType().isArrayType() &&
+                PDataType.arrayBaseType(getDataType()).getByteSize() == null) {
+            Object value = getValue();
+            if (value instanceof PhoenixArray) {
+                // Return the max length of the underlying PhoenixArray data
+                return ((PhoenixArray) value).getMaxLength();
+            }
+        }
         return maxLength;
     }