Undo some inadvertent variable renames in SQL

We recently renamed "metaData" to "metadata" in all of the places. We
were slightly aggressive in doing this rename in the SQL codebase where
"MetaData" is used by the JDK for its naming of these classes, and we
tried to keep SQL consistent with that, but inadvertently renamed a few
things that we should not have. Also, since we did not make these
renames in the 7.x branch, we should rename them back in the master
branch for reasons of consistency too.

Relates #54519

x-pack/plugin/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcResultSetMetaDataTests.java

@@ -23,30 +23,30 @@ public class JdbcResultSetMetaDataTests extends ESTestCase {
                 new JdbcColumnInfo("test_double", EsType.DOUBLE, EMPTY, EMPTY, EMPTY, EMPTY, 25),
                 new JdbcColumnInfo("test_long", EsType.LONG, "test_table", "test", "schema", "custom_label", 20)
             );
-    private final JdbcResultSetMetaData metadata = new JdbcResultSetMetaData(null, columns);
+    private final JdbcResultSetMetaData metaData = new JdbcResultSetMetaData(null, columns);
 
     public void testColumnsProperties() throws SQLException {
         int maxColumnIndex = columns.size();
-        assertEquals(false, metadata.isAutoIncrement(randomIntBetween(1, maxColumnIndex)));
-        assertEquals(true, metadata.isCaseSensitive(randomIntBetween(1, maxColumnIndex)));
-        assertEquals(true, metadata.isSearchable(randomIntBetween(1, maxColumnIndex)));
-        assertEquals(false, metadata.isCurrency(randomIntBetween(1, maxColumnIndex)));
-        assertEquals(ResultSetMetaData.columnNullableUnknown, metadata.isNullable(randomIntBetween(1, maxColumnIndex)));
-        assertEquals(false, metadata.isSigned(1));
-        assertEquals(true, metadata.isSigned(2));
-        assertEquals(true, metadata.isSigned(3));
-        assertEquals(true, metadata.isSigned(4));
+        assertEquals(false, metaData.isAutoIncrement(randomIntBetween(1, maxColumnIndex)));
+        assertEquals(true, metaData.isCaseSensitive(randomIntBetween(1, maxColumnIndex)));
+        assertEquals(true, metaData.isSearchable(randomIntBetween(1, maxColumnIndex)));
+        assertEquals(false, metaData.isCurrency(randomIntBetween(1, maxColumnIndex)));
+        assertEquals(ResultSetMetaData.columnNullableUnknown, metaData.isNullable(randomIntBetween(1, maxColumnIndex)));
+        assertEquals(false, metaData.isSigned(1));
+        assertEquals(true, metaData.isSigned(2));
+        assertEquals(true, metaData.isSigned(3));
+        assertEquals(true, metaData.isSigned(4));
     }
 
     public void testColumnNamesAndLabels() throws SQLException {
-        assertEquals("test_keyword", metadata.getColumnName(1));
-        assertEquals("test_integer", metadata.getColumnName(2));
-        assertEquals("test_double", metadata.getColumnName(3));
-        assertEquals("test_long", metadata.getColumnName(4));
-
-        assertEquals("test_keyword", metadata.getColumnLabel(1));
-        assertEquals("test_integer", metadata.getColumnLabel(2));
-        assertEquals("test_double", metadata.getColumnLabel(3));
-        assertEquals("custom_label", metadata.getColumnLabel(4));
+        assertEquals("test_keyword", metaData.getColumnName(1));
+        assertEquals("test_integer", metaData.getColumnName(2));
+        assertEquals("test_double", metaData.getColumnName(3));
+        assertEquals("test_long", metaData.getColumnName(4));
+
+        assertEquals("test_keyword", metaData.getColumnLabel(1));
+        assertEquals("test_integer", metaData.getColumnLabel(2));
+        assertEquals("test_double", metaData.getColumnLabel(3));
+        assertEquals("custom_label", metaData.getColumnLabel(4));
     }
 }

x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcAssert.java

@@ -206,8 +206,8 @@ public class JdbcAssert {
 
     private static void doAssertResultSetData(ResultSet expected, ResultSet actual, Logger logger, boolean lenientDataType,
             boolean lenientFloatingNumbers) throws SQLException {
-        ResultSetMetaData MetaData = expected.getMetaData();
-        int columns = MetaData.getColumnCount();
+        ResultSetMetaData metaData = expected.getMetaData();
+        int columns = metaData.getColumnCount();
 
         long count = 0;
         try {
@@ -219,10 +219,10 @@ public class JdbcAssert {
                 }
 
                 for (int column = 1; column <= columns; column++) {
-                    int type = MetaData.getColumnType(column);
+                    int type = metaData.getColumnType(column);
                     Class<?> expectedColumnClass = null;
                     try {
-                        String columnClassName = MetaData.getColumnClassName(column);
+                        String columnClassName = metaData.getColumnClassName(column);
 
                         // fix for CSV which returns the shortName not fully-qualified name
                         if (columnClassName != null && !columnClassName.contains(".")) {
@@ -258,7 +258,7 @@ public class JdbcAssert {
                             : actual.getObject(column);
 
                     String msg = format(Locale.ROOT, "Different result for column [%s], entry [%d]",
-                        MetaData.getColumnName(column), count + 1);
+                        metaData.getColumnName(column), count + 1);
 
                     // handle nulls first
                     if (expectedObject == null || actualObject == null) {

x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcTestUtils.java

@@ -51,20 +51,20 @@ final class JdbcTestUtils {
     static final LocalDate EPOCH = LocalDate.of(1970, 1, 1);
 
     static void logResultSetMetaData(ResultSet rs, Logger logger) throws SQLException {
-        ResultSetMetaData metadata = rs.getMetaData();
+        ResultSetMetaData metaData = rs.getMetaData();
         // header
         StringBuilder sb = new StringBuilder();
         StringBuilder column = new StringBuilder();
 
-        int columns = metadata.getColumnCount();
+        int columns = metaData.getColumnCount();
         for (int i = 1; i <= columns; i++) {
             if (i > 1) {
                 sb.append(" | ");
             }
             column.setLength(0);
-            column.append(metadata.getColumnName(i));
+            column.append(metaData.getColumnName(i));
             column.append("(");
-            column.append(metadata.getColumnTypeName(i));
+            column.append(metaData.getColumnTypeName(i));
             column.append(")");
 
             sb.append(trimOrPad(column));
@@ -81,9 +81,9 @@ final class JdbcTestUtils {
     }
 
     static void logResultSetData(ResultSet rs, Logger log) throws SQLException {
-        ResultSetMetaData metadata = rs.getMetaData();
+        ResultSetMetaData metaData = rs.getMetaData();
 
-        int columns = metadata.getColumnCount();
+        int columns = metaData.getColumnCount();
 
         while (rs.next()) {
             log.info(rowAsString(rs, columns));
@@ -91,8 +91,8 @@ final class JdbcTestUtils {
     }
 
     static String resultSetCurrentData(ResultSet rs) throws SQLException {
-        ResultSetMetaData metadata = rs.getMetaData();
-        return rowAsString(rs, metadata.getColumnCount());
+        ResultSetMetaData metaData = rs.getMetaData();
+        return rowAsString(rs, metaData.getColumnCount());
     }
 
     private static String rowAsString(ResultSet rs, int columns) throws SQLException {
@@ -122,14 +122,14 @@ final class JdbcTestUtils {
     }
 
     public static void logLikeCLI(ResultSet rs, Logger logger) throws SQLException {
-        ResultSetMetaData metadata = rs.getMetaData();
-        int columns = metadata.getColumnCount();
+        ResultSetMetaData metaData = rs.getMetaData();
+        int columns = metaData.getColumnCount();
 
         List<ColumnInfo> cols = new ArrayList<>(columns);
 
         for (int i = 1; i <= columns; i++) {
-            cols.add(new ColumnInfo(metadata.getTableName(i), metadata.getColumnName(i), metadata.getColumnTypeName(i),
-                    metadata.getColumnDisplaySize(i)));
+            cols.add(new ColumnInfo(metaData.getTableName(i), metaData.getColumnName(i), metaData.getColumnTypeName(i),
+                    metaData.getColumnDisplaySize(i)));
         }
 
 

x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/ResultSetMetaDataTestCase.java

@@ -47,10 +47,10 @@ public class ResultSetMetaDataTestCase extends JdbcIntegrationTestCase {
         }
     }
 
-    private void assertColumnNamesAndLabels(ResultSetMetaData MetaData, String[] names) throws SQLException {
+    private void assertColumnNamesAndLabels(ResultSetMetaData metaData, String[] names) throws SQLException {
         for(int i = 0; i < fieldsNames.length; i++) {
-            assertEquals(names[i], MetaData.getColumnName(i + 1));
-            assertEquals(names[i], MetaData.getColumnLabel(i + 1));
+            assertEquals(names[i], metaData.getColumnName(i + 1));
+            assertEquals(names[i], metaData.getColumnLabel(i + 1));
         }
     }
 }