Skip to content

Commit

Permalink
Undo some inadvertent variable renames in SQL
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@jasontedor
jasontedor committed Apr 4, 2020
1 parent 7d9d63e commit bcc13ec
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
38 changes: 19 additions & 19 deletions ...n/sql/jdbc/src/test/java/org/elasticsearch/xpack/sql/jdbc/JdbcResultSetMetaDataTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
10 changes: 5 additions & 5 deletions x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcAssert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,8 @@ public static void assertResultSetData(ResultSet expected, ResultSet actual, Log

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 {
Expand All @@ -219,10 +219,10 @@ private static void doAssertResultSetData(ResultSet expected, ResultSet actual,
}

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(".")) {
Expand Down Expand Up @@ -258,7 +258,7 @@ private static void doAssertResultSetData(ResultSet expected, ResultSet actual,
: 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) {
Expand Down
24 changes: 12 additions & 12 deletions x-pack/plugin/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/JdbcTestUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ private 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));
Expand All @@ -81,18 +81,18 @@ static void logResultSetMetaData(ResultSet rs, Logger logger) throws SQLExceptio
}

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));
}
}

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 {
Expand Down Expand Up @@ -122,14 +122,14 @@ private static StringBuilder trimOrPad(StringBuilder buffer) {
}

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)));
}


Expand Down
6 changes: 3 additions & 3 deletions ...n/sql/qa/src/main/java/org/elasticsearch/xpack/sql/qa/jdbc/ResultSetMetaDataTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ private void doWithQuery(String query, CheckedConsumer<ResultSet, SQLException>
}
}

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));
}
}
}

0 comments on commit bcc13ec

Please sign in to comment.