jcamachor commented on a change in pull request #1328:
URL: https://github.com/apache/hive/pull/1328#discussion_r461672364
##########
File path:
jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/JdbcRecordIterator.java
##########
@@ -59,9 +63,26 @@ public JdbcRecordIterator(Connection conn, PreparedStatement
ps, ResultSet rs, C
fieldNamesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_NAMES));
fieldTypesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_TYPES));
} else {
- fieldNamesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMNS));
- fieldTypesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMN_TYPES));
+ try {
+ if(conf.get(Constants.JDBC_QUERY) == null) {
+ ResultSetMetaData metadata = rs.getMetaData();
+ int numColumns = metadata.getColumnCount();
+ List<String> columnNames = new ArrayList<String>(numColumns);
+ for (int i = 0; i < numColumns; i++) {
+ columnNames.add(metadata.getColumnName(i + 1));
+ }
+ fieldNamesProperty = String.join(",",columnNames);
+ }
+ else
+ fieldNamesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMNS));
+ }
+ catch (Exception e) {
+ LOGGER.error("Error while trying to get column names.", e);
+ throw new HiveJdbcDatabaseAccessException("Error while trying to get
column names: " + e.getMessage(), e);
+ }
+ fieldTypesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMN_TYPES));
}
+ LOGGER.debug("Iterator ColumnNames = "+fieldNamesProperty);
Review comment:
`LOGGER.debug("Iterator ColumnNames = {}", fieldNamesProperty);`
##########
File path:
jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/JdbcRecordIterator.java
##########
@@ -59,9 +63,26 @@ public JdbcRecordIterator(Connection conn, PreparedStatement
ps, ResultSet rs, C
fieldNamesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_NAMES));
fieldTypesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_TYPES));
} else {
- fieldNamesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMNS));
- fieldTypesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMN_TYPES));
+ try {
Review comment:
nit. Indentation seems off.
##########
File path:
jdbc-handler/src/main/java/org/apache/hive/storage/jdbc/dao/JdbcRecordIterator.java
##########
@@ -59,9 +63,26 @@ public JdbcRecordIterator(Connection conn, PreparedStatement
ps, ResultSet rs, C
fieldNamesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_NAMES));
fieldTypesProperty =
Preconditions.checkNotNull(conf.get(Constants.JDBC_QUERY_FIELD_TYPES));
} else {
- fieldNamesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMNS));
- fieldTypesProperty =
Preconditions.checkNotNull(conf.get(serdeConstants.LIST_COLUMN_TYPES));
+ try {
+ if(conf.get(Constants.JDBC_QUERY) == null) {
+ ResultSetMetaData metadata = rs.getMetaData();
+ int numColumns = metadata.getColumnCount();
+ List<String> columnNames = new ArrayList<String>(numColumns);
+ for (int i = 0; i < numColumns; i++) {
+ columnNames.add(metadata.getColumnName(i + 1));
+ }
+ fieldNamesProperty = String.join(",",columnNames);
+ }
+ else
Review comment:
This is by convention, we use { & } even for single line statements.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org
For additional commands, e-mail: gitbox-h...@hive.apache.org
