Skip to content

Commit bcc13ec

Browse files
jasontedorjasontedor
committed
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
1 parent 7d9d63e commit bcc13ec

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,30 @@ public class JdbcResultSetMetaDataTests extends ESTestCase {
2323
new JdbcColumnInfo("test_double", EsType.DOUBLE, EMPTY, EMPTY, EMPTY, EMPTY, 25),
2424
new JdbcColumnInfo("test_long", EsType.LONG, "test_table", "test", "schema", "custom_label", 20)
2525
);
26-
private final JdbcResultSetMetaData metadata = new JdbcResultSetMetaData(null, columns);
26+
private final JdbcResultSetMetaData metaData = new JdbcResultSetMetaData(null, columns);
2727

2828
public void testColumnsProperties() throws SQLException {
2929
int maxColumnIndex = columns.size();
30-
assertEquals(false, metadata.isAutoIncrement(randomIntBetween(1, maxColumnIndex)));
31-
assertEquals(true, metadata.isCaseSensitive(randomIntBetween(1, maxColumnIndex)));
32-
assertEquals(true, metadata.isSearchable(randomIntBetween(1, maxColumnIndex)));
33-
assertEquals(false, metadata.isCurrency(randomIntBetween(1, maxColumnIndex)));
34-
assertEquals(ResultSetMetaData.columnNullableUnknown, metadata.isNullable(randomIntBetween(1, maxColumnIndex)));
35-
assertEquals(false, metadata.isSigned(1));
36-
assertEquals(true, metadata.isSigned(2));
37-
assertEquals(true, metadata.isSigned(3));
38-
assertEquals(true, metadata.isSigned(4));
30+
assertEquals(false, metaData.isAutoIncrement(randomIntBetween(1, maxColumnIndex)));
31+
assertEquals(true, metaData.isCaseSensitive(randomIntBetween(1, maxColumnIndex)));
32+
assertEquals(true, metaData.isSearchable(randomIntBetween(1, maxColumnIndex)));
33+
assertEquals(false, metaData.isCurrency(randomIntBetween(1, maxColumnIndex)));
34+
assertEquals(ResultSetMetaData.columnNullableUnknown, metaData.isNullable(randomIntBetween(1, maxColumnIndex)));
35+
assertEquals(false, metaData.isSigned(1));
36+
assertEquals(true, metaData.isSigned(2));
37+
assertEquals(true, metaData.isSigned(3));
38+
assertEquals(true, metaData.isSigned(4));
3939
}
4040

4141
public void testColumnNamesAndLabels() throws SQLException {
42-
assertEquals("test_keyword", metadata.getColumnName(1));
43-
assertEquals("test_integer", metadata.getColumnName(2));
44-
assertEquals("test_double", metadata.getColumnName(3));
45-
assertEquals("test_long", metadata.getColumnName(4));
46-
47-
assertEquals("test_keyword", metadata.getColumnLabel(1));
48-
assertEquals("test_integer", metadata.getColumnLabel(2));
49-
assertEquals("test_double", metadata.getColumnLabel(3));
50-
assertEquals("custom_label", metadata.getColumnLabel(4));
42+
assertEquals("test_keyword", metaData.getColumnName(1));
43+
assertEquals("test_integer", metaData.getColumnName(2));
44+
assertEquals("test_double", metaData.getColumnName(3));
45+
assertEquals("test_long", metaData.getColumnName(4));
46+
47+
assertEquals("test_keyword", metaData.getColumnLabel(1));
48+
assertEquals("test_integer", metaData.getColumnLabel(2));
49+
assertEquals("test_double", metaData.getColumnLabel(3));
50+
assertEquals("custom_label", metaData.getColumnLabel(4));
5151
}
5252
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ public static void assertResultSetData(ResultSet expected, ResultSet actual, Log
206206

207207
private static void doAssertResultSetData(ResultSet expected, ResultSet actual, Logger logger, boolean lenientDataType,
208208
boolean lenientFloatingNumbers) throws SQLException {
209-
ResultSetMetaData MetaData = expected.getMetaData();
210-
int columns = MetaData.getColumnCount();
209+
ResultSetMetaData metaData = expected.getMetaData();
210+
int columns = metaData.getColumnCount();
211211

212212
long count = 0;
213213
try {
@@ -219,10 +219,10 @@ private static void doAssertResultSetData(ResultSet expected, ResultSet actual,
219219
}
220220

221221
for (int column = 1; column <= columns; column++) {
222-
int type = MetaData.getColumnType(column);
222+
int type = metaData.getColumnType(column);
223223
Class<?> expectedColumnClass = null;
224224
try {
225-
String columnClassName = MetaData.getColumnClassName(column);
225+
String columnClassName = metaData.getColumnClassName(column);
226226

227227
// fix for CSV which returns the shortName not fully-qualified name
228228
if (columnClassName != null && !columnClassName.contains(".")) {
@@ -258,7 +258,7 @@ private static void doAssertResultSetData(ResultSet expected, ResultSet actual,
258258
: actual.getObject(column);
259259

260260
String msg = format(Locale.ROOT, "Different result for column [%s], entry [%d]",
261-
MetaData.getColumnName(column), count + 1);
261+
metaData.getColumnName(column), count + 1);
262262

263263
// handle nulls first
264264
if (expectedObject == null || actualObject == null) {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,20 @@ private JdbcTestUtils() {}
5151
static final LocalDate EPOCH = LocalDate.of(1970, 1, 1);
5252

5353
static void logResultSetMetaData(ResultSet rs, Logger logger) throws SQLException {
54-
ResultSetMetaData metadata = rs.getMetaData();
54+
ResultSetMetaData metaData = rs.getMetaData();
5555
// header
5656
StringBuilder sb = new StringBuilder();
5757
StringBuilder column = new StringBuilder();
5858

59-
int columns = metadata.getColumnCount();
59+
int columns = metaData.getColumnCount();
6060
for (int i = 1; i <= columns; i++) {
6161
if (i > 1) {
6262
sb.append(" | ");
6363
}
6464
column.setLength(0);
65-
column.append(metadata.getColumnName(i));
65+
column.append(metaData.getColumnName(i));
6666
column.append("(");
67-
column.append(metadata.getColumnTypeName(i));
67+
column.append(metaData.getColumnTypeName(i));
6868
column.append(")");
6969

7070
sb.append(trimOrPad(column));
@@ -81,18 +81,18 @@ static void logResultSetMetaData(ResultSet rs, Logger logger) throws SQLExceptio
8181
}
8282

8383
static void logResultSetData(ResultSet rs, Logger log) throws SQLException {
84-
ResultSetMetaData metadata = rs.getMetaData();
84+
ResultSetMetaData metaData = rs.getMetaData();
8585

86-
int columns = metadata.getColumnCount();
86+
int columns = metaData.getColumnCount();
8787

8888
while (rs.next()) {
8989
log.info(rowAsString(rs, columns));
9090
}
9191
}
9292

9393
static String resultSetCurrentData(ResultSet rs) throws SQLException {
94-
ResultSetMetaData metadata = rs.getMetaData();
95-
return rowAsString(rs, metadata.getColumnCount());
94+
ResultSetMetaData metaData = rs.getMetaData();
95+
return rowAsString(rs, metaData.getColumnCount());
9696
}
9797

9898
private static String rowAsString(ResultSet rs, int columns) throws SQLException {
@@ -122,14 +122,14 @@ private static StringBuilder trimOrPad(StringBuilder buffer) {
122122
}
123123

124124
public static void logLikeCLI(ResultSet rs, Logger logger) throws SQLException {
125-
ResultSetMetaData metadata = rs.getMetaData();
126-
int columns = metadata.getColumnCount();
125+
ResultSetMetaData metaData = rs.getMetaData();
126+
int columns = metaData.getColumnCount();
127127

128128
List<ColumnInfo> cols = new ArrayList<>(columns);
129129

130130
for (int i = 1; i <= columns; i++) {
131-
cols.add(new ColumnInfo(metadata.getTableName(i), metadata.getColumnName(i), metadata.getColumnTypeName(i),
132-
metadata.getColumnDisplaySize(i)));
131+
cols.add(new ColumnInfo(metaData.getTableName(i), metaData.getColumnName(i), metaData.getColumnTypeName(i),
132+
metaData.getColumnDisplaySize(i)));
133133
}
134134

135135

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ private void doWithQuery(String query, CheckedConsumer<ResultSet, SQLException>
4747
}
4848
}
4949

50-
private void assertColumnNamesAndLabels(ResultSetMetaData MetaData, String[] names) throws SQLException {
50+
private void assertColumnNamesAndLabels(ResultSetMetaData metaData, String[] names) throws SQLException {
5151
for(int i = 0; i < fieldsNames.length; i++) {
52-
assertEquals(names[i], MetaData.getColumnName(i + 1));
53-
assertEquals(names[i], MetaData.getColumnLabel(i + 1));
52+
assertEquals(names[i], metaData.getColumnName(i + 1));
53+
assertEquals(names[i], metaData.getColumnLabel(i + 1));
5454
}
5555
}
5656
}

0 commit comments

Comments
 (0)