PHOENIX-7627 Atomic Delete return row fails for case-sensitive schema and table names (#2171)

Author: virajjasani

phoenix-core-client/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java

@@ -884,9 +884,7 @@ public long getUpdateCount() {
          * @throws SQLException If something goes wrong with server side operation.
          */
         private MutationState deleteRowAndGetMutationState(PTable table) throws SQLException {
-            Table hTable =
-                    connection.getQueryServices()
-                            .getTable(table.getTableName().getBytes());
+            Table hTable = connection.getQueryServices().getTable(table.getName().getBytes());
             try (ResultScanner scanner = hTable.getScanner(
                     new Scan(context.getScan()))) {
                 Result res = scanner.next();

phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java

@@ -687,10 +687,14 @@ public Pair<Integer, ResultSet> call() throws SQLException {
                                     queryLogger.syncAudit();
                                 }
                                 success = true;
+                                TableName tableNameVal = isUpsert ?
+                                        ((ExecutableUpsertStatement) stmt).getTable().getName() :
+                                        (isDelete ? ((ExecutableDeleteStatement) stmt)
+                                                .getTable().getName() : null);
                                 return new Pair<>(lastUpdateCount,
                                     result == null || result.isEmpty() ?
                                         null : TupleUtil.getResultSet(new ResultTuple(result),
-                                        tableName, connection));
+                                        tableNameVal, connection));
                             }
                             //Force update cache and retry if meta not found error occurs
                             catch (MetaDataEntityNotFoundException e) {

phoenix-core-client/src/main/java/org/apache/phoenix/util/TupleUtil.java

@@ -44,6 +44,7 @@
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.jdbc.PhoenixResultSet;
 import org.apache.phoenix.jdbc.PhoenixPrefetchedResultSet;
+import org.apache.phoenix.parse.TableName;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.SortOrder;
@@ -230,10 +231,13 @@ public static int write(Tuple result, DataOutput out) throws IOException {
      * @return ResultSet for the give single row.
      * @throws SQLException If any SQL operation fails.
      */
-    public static ResultSet getResultSet(Tuple toProject, String tableName, Connection conn)
+    public static ResultSet getResultSet(Tuple toProject, TableName tableName, Connection conn)
         throws SQLException {
+        if (tableName == null) {
+            return null;
+        }
         try (PhoenixResultSet resultSet = (PhoenixResultSet) conn.createStatement()
-            .executeQuery("SELECT * FROM \"" + tableName + "\"")) {
+            .executeQuery("SELECT * FROM " + tableName)) {
             PTable pTable =
                 resultSet.getStatement().getQueryPlan().getContext().getResolver().getTables()
                     .get(0).getTable();

phoenix-core/src/it/java/org/apache/phoenix/end2end/OnDuplicateKey2IT.java

@@ -231,6 +231,108 @@ public void testReturnRowResult2() throws Exception {
         }
     }
 
+    @Test
+    public void testReturnRowResult4() throws Exception {
+        Assume.assumeTrue("Set correct result to RegionActionResult on hbase versions " +
+                "2.4.18+, 2.5.9+, and 2.6.0+", isSetCorrectResultEnabledOnHBase());
+        // NOTE - Tuple result projection does not work well with local index because
+        // this assertion can be false: CellUtil.matchingRows(kvs[0], kvs[kvs.length-1])
+        // as the Tuple contains different rowkeys.
+        Assume.assumeTrue("ResultSet return does not work with local index",
+                !indexDDL.startsWith("create local index"));
+
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+        String sample1 = getJsonString("json/sample_01.json");
+        String sample2 = getJsonString("json/sample_02.json");
+        BsonDocument bsonDocument1 = RawBsonDocument.parse(sample1);
+        BsonDocument bsonDocument2 = RawBsonDocument.parse(sample2);
+        try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+            conn.setAutoCommit(true);
+            String tableName = "XYZ.\"abc123" + generateUniqueName() + "\"";
+            String ddl = "CREATE TABLE " + tableName
+                    + "(PK1 VARCHAR, PK2 DOUBLE NOT NULL, PK3 VARCHAR, COUNTER1 DOUBLE,"
+                    + " COUNTER2 VARCHAR,"
+                    + " COL3 BSON, COL4 INTEGER, CONSTRAINT pk PRIMARY KEY(PK1, PK2, PK3))";
+            conn.createStatement().execute(ddl);
+            if (!indexDDL.isEmpty()) {
+                String indexDdl =
+                        String.format(indexDDL, "abc123" + generateUniqueName(), tableName);
+                conn.createStatement().execute(indexDdl);
+            }
+
+            validateAtomicUpsertReturnRow(tableName, conn, bsonDocument1, bsonDocument2);
+
+            PhoenixPreparedStatement ps =
+                    conn.prepareStatement(
+                                    "DELETE FROM " + tableName + " WHERE PK1 = ? AND PK2 " +
+                                            "= ? AND PK3 = ? AND COL4 = ?")
+                            .unwrap(PhoenixPreparedStatement.class);
+            ps.setString(1, "pk000");
+            ps.setDouble(2, -123.98);
+            ps.setString(3, "pk003");
+            ps.setInt(4, 235);
+            validateReturnedRowAfterDelete(ps, "col2_001", true, false, bsonDocument2, 234);
+
+            ps = conn.prepareStatement("DELETE FROM " + tableName
+                            + " WHERE PK1 = ? AND PK2 = ? AND PK3 = ? AND COL4 = ?")
+                    .unwrap(PhoenixPreparedStatement.class);
+            ps.setString(1, "pk000");
+            ps.setDouble(2, -123.98);
+            ps.setString(3, "pk003");
+            ps.setInt(4, 234);
+            validateReturnedRowAfterDelete(ps, "col2_001", true, true, bsonDocument2, 234);
+
+            validateReturnedRowAfterDelete(ps, "col2_001", true, false, bsonDocument2, 234);
+
+            validateMultiRowDelete(tableName, conn, bsonDocument2);
+        }
+    }
+
+    @Test
+    public void testReturnRowResult3() throws Exception {
+        Assume.assumeTrue("Set correct result to RegionActionResult on hbase versions " +
+                "2.4.18+, 2.5.9+, and 2.6.0+", isSetCorrectResultEnabledOnHBase());
+        // NOTE - Tuple result projection does not work well with local index because
+        // this assertion can be false: CellUtil.matchingRows(kvs[0], kvs[kvs.length-1])
+        // as the Tuple contains different rowkeys.
+        Assume.assumeTrue("ResultSet return does not work with local index",
+                !indexDDL.startsWith("create local index"));
+
+        Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+        String sample1 = getJsonString("json/sample_01.json");
+        String sample2 = getJsonString("json/sample_02.json");
+        BsonDocument bsonDocument1 = RawBsonDocument.parse(sample1);
+        BsonDocument bsonDocument2 = RawBsonDocument.parse(sample2);
+        try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+            conn.setAutoCommit(true);
+            String tableName = "XYZ.\"abc123" + generateUniqueName() + "\"";
+            String ddl = "CREATE TABLE " + tableName
+                    + "(PK1 VARCHAR, PK2 DOUBLE NOT NULL, PK3 VARCHAR, COUNTER1 DOUBLE,"
+                    + " COUNTER2 VARCHAR,"
+                    + " COL3 BSON, COL4 INTEGER, CONSTRAINT pk PRIMARY KEY(PK1, PK2, PK3))";
+            conn.createStatement().execute(ddl);
+            if (!indexDDL.isEmpty()) {
+                String indexDdl =
+                        String.format(indexDDL, "abc123" + generateUniqueName(), tableName);
+                conn.createStatement().execute(indexDdl);
+            }
+
+            validateAtomicUpsertReturnRow(tableName, conn, bsonDocument1, bsonDocument2);
+
+            PhoenixPreparedStatement ps =
+                    conn.prepareStatement(
+                            "DELETE FROM " + tableName + " WHERE PK1 = ? AND PK2 " +
+                                    "= ? AND PK3 = ?").unwrap(PhoenixPreparedStatement.class);
+            ps.setString(1, "pk000");
+            ps.setDouble(2, -123.98);
+            ps.setString(3, "pk003");
+            validateReturnedRowAfterDelete(ps, "col2_001", true, true, bsonDocument2, 234);
+            validateReturnedRowAfterDelete(ps, "col2_001", true, false, bsonDocument2, 234);
+
+            validateMultiRowDelete(tableName, conn, bsonDocument2);
+        }
+    }
+
     private void verifyIndexRow(Connection conn, String tableName, boolean deleted) throws SQLException {
         PreparedStatement preparedStatement =
                 conn.prepareStatement("SELECT COUNTER2 FROM " + tableName + " WHERE COUNTER1 " +
@@ -408,7 +510,6 @@ private static void validateReturnedRowAfterUpsert(Connection conn,
         }
         assertEquals(success ? 1 : 0, resultPair.getFirst().intValue());
         ResultSet resultSet = resultPair.getSecond();
-        PTable table = conn.unwrap(PhoenixConnection.class).getTable(tableName);
 
         assertEquals("pk000", resultSet.getString(1));
         assertEquals(-123.98, resultSet.getDouble(2), 0.0);