deniskuzZ commented on code in PR #6413:
URL: https://github.com/apache/hive/pull/6413#discussion_r3380262221
##########
ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java:
##########
@@ -11999,47 +12007,45 @@ private Operator genTablePlan(String alias, QB qb)
throws SemanticException {
// Determine row schema for TSOP.
// Include column names from SerDe, the partition and virtual columns.
rwsch = new RowResolver();
- try {
- // Including parameters passed in the query
- if (properties != null) {
- for (Entry<String, String> prop : properties.entrySet()) {
- if (tab.getSerdeParam(prop.getKey()) != null) {
- LOG.warn("SerDe property in input query overrides stored SerDe
property");
- }
- tab.setSerdeParam(prop.getKey(), prop.getValue());
+ // Including parameters passed in the query
+ if (properties != null) {
+ for (Entry<String, String> prop : properties.entrySet()) {
+ if (tab.getSerdeParam(prop.getKey()) != null) {
+ LOG.warn("SerDe property in input query overrides stored SerDe
property");
}
+ tab.setSerdeParam(prop.getKey(), prop.getValue());
}
- // Obtain inspector for schema
- final Deserializer deserializer = tab.getDeserializer();
- StructObjectInspector rowObjectInspector = (StructObjectInspector)
deserializer.getObjectInspector();
+ }
+ final Deserializer deserializer = tab.getDeserializer();
- deserializer.handleJobLevelConfiguration(conf);
- List<? extends StructField> fields = rowObjectInspector
- .getAllStructFieldRefs();
- Set<String> partCols = tab.hasNonNativePartitionSupport() ?
- Sets.newHashSet(tab.getPartColNames()) : Collections.emptySet();
- for (int i = 0; i < fields.size(); i++) {
- /**
- * if the column is a skewed column, use ColumnInfo accordingly
- */
- ColumnInfo colInfo = new ColumnInfo(fields.get(i).getFieldName(),
- TypeInfoUtils.getTypeInfoFromObjectInspector(fields.get(i)
- .getFieldObjectInspector()), alias, false);
- if (partCols.contains(colInfo.getInternalName())) {
- colInfo.setHiddenPartitionCol(true);
- }
- colInfo.setSkewedCol(isSkewedCol(alias, qb,
fields.get(i).getFieldName()));
- rwsch.put(alias, fields.get(i).getFieldName(), colInfo);
+ deserializer.handleJobLevelConfiguration(conf);
+
+ int colCount = tab.getAllCols().size();
+ List<ColumnInfo> colInfoList = new
ArrayList<>(Collections.nCopies(colCount, null));
+ List<String> colNameList = new ArrayList<>(Collections.nCopies(colCount,
null));
+
+ for (FieldSchema field : tab.getCols()) {
Review Comment:
@ramitg254 would this work
````
StructObjectInspector rowObjectInspector;
try {
rowObjectInspector = (StructObjectInspector)
deserializer.getObjectInspector();
} catch (SerDeException e) {
throw new RuntimeException(e);
}
int colCount = tab.getAllCols().size();
List<ColumnInfo> colInfoList = new ArrayList<>(Collections.nCopies(colCount,
null));
// Build column info from the SerDe row schema (authoritative names/types),
placed by table column index.
for (StructField field : rowObjectInspector.getAllStructFieldRefs()) {
String fieldName = field.getFieldName();
ColumnInfo colInfo = new ColumnInfo(fieldName,
TypeInfoUtils.getTypeInfoFromObjectInspector(field.getFieldObjectInspector()),
alias, false);
colInfo.setSkewedCol(isSkewedCol(alias, qb, fieldName));
colInfoList.set(tab.getColumnIndexByName(fieldName), colInfo);
}
for (FieldSchema partCol : tab.getPartCols()) {
LOG.trace("Adding partition col: {} ", partCol);
ColumnInfo colInfo = new ColumnInfo(partCol.getName(),
TypeInfoFactory.getPrimitiveTypeInfo(partCol.getType()), alias, true);
Integer index = tab.getColumnIndexByName(partCol.getName());
if (index != null) {
colInfoList.set(index, colInfo);
}
}
for (ColumnInfo colInfo : colInfoList) {
rwsch.put(alias, colInfo.getInternalName(), colInfo);
}
````
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
