deniskuzZ commented on code in PR #3557:
URL: https://github.com/apache/hive/pull/3557#discussion_r973135097
##########
standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java:
##########
@@ -1011,96 +1015,61 @@ private Path constructRenamedPath(Path defaultNewPath,
Path currentPath) {
defaultNewPath.toUri().getPath());
}
- @VisibleForTesting
- public static List<ColumnStatistics>
alterTableUpdateTableColumnStats(RawStore msdb, Table oldTable, Table newTable,
- EnvironmentContext ec, String validWriteIds, Configuration conf,
List<String> deletedCols)
- throws MetaException, InvalidObjectException {
- String catName = normalizeIdentifier(oldTable.isSetCatName() ?
oldTable.getCatName() :
- getDefaultCatalog(conf));
+ public static List<ColumnStatistics> getColumnStats(RawStore msdb, Table
oldTable)
+ throws NoSuchObjectException, MetaException {
+ String catName = normalizeIdentifier(oldTable.isSetCatName()
+ ? oldTable.getCatName()
+ : getDefaultCatalog(msdb.getConf()));
String dbName = oldTable.getDbName().toLowerCase();
String tableName = normalizeIdentifier(oldTable.getTableName());
- String newDbName = newTable.getDbName().toLowerCase();
- String newTableName = normalizeIdentifier(newTable.getTableName());
- //if its not called from cahced store then update the table
- boolean doAlterTable = deletedCols == null;
- List<ColumnStatistics> newMultiColStats = new ArrayList<>();
+ return msdb.getTableColumnStatistics(catName, dbName, tableName,
+
oldTable.getSd().getCols().stream().map(FieldSchema::getName).collect(Collectors.toList()));
+ }
+ @VisibleForTesting
+ public static List<ColumnStatistics> deleteTableColumnStats(RawStore msdb,
Table oldTable, Table newTable, List<ColumnStatistics> multiColStats)
+ throws InvalidObjectException, MetaException {
+ List<ColumnStatistics> newMultiColStats = new ArrayList<>();
try {
- List<FieldSchema> oldCols = oldTable.getSd().getCols();
- List<FieldSchema> newCols = newTable.getSd().getCols();
- List<ColumnStatistics> multiColStats = null;
- boolean updateColumnStats = !newDbName.equals(dbName) ||
!newTableName.equals(tableName)
- || !MetaStoreServerUtils.columnsIncludedByNameType(oldCols, newCols);
- // Don't bother in the case of ACID conversion.
- updateColumnStats = updateColumnStats
- && (TxnUtils.isAcidTable(oldTable) ==
TxnUtils.isAcidTable(newTable));
- if (updateColumnStats) {
- List<String> oldColNames = new ArrayList<>(oldCols.size());
- for (FieldSchema oldCol : oldCols) {
- oldColNames.add(oldCol.getName());
- }
+ String catName = normalizeIdentifier(oldTable.isSetCatName()
+ ? oldTable.getCatName()
+ : getDefaultCatalog(msdb.getConf()));
+ String dbName = oldTable.getDbName().toLowerCase();
+ String tableName = normalizeIdentifier(oldTable.getTableName());
+ String newDbName = newTable.getDbName().toLowerCase();
+ String newTableName = normalizeIdentifier(newTable.getTableName());
+ List<FieldSchema> oldTableCols = oldTable.getSd().getCols();
+ List<FieldSchema> newTableCols = newTable.getSd().getCols();
+
+ boolean nameChanged = !newDbName.equals(dbName) ||
!newTableName.equals(tableName);
+
+ if ((nameChanged ||
!MetaStoreServerUtils.columnsIncludedByNameType(oldTableCols, newTableCols)) &&
+ // Don't bother in the case of ACID conversion.
+ TxnUtils.isAcidTable(oldTable) == TxnUtils.isAcidTable(newTable)) {
+ for (ColumnStatistics colStats : multiColStats) {
+ List<ColumnStatisticsObj> statsObjs = colStats.getStatsObj();
+ List<ColumnStatisticsObj> newStatsObjs = new ArrayList<>();
- // NOTE: this doesn't check stats being compliant, but the alterTable
call below does.
- // The worst we can do is delete the stats.
- // Collect column stats which need to be rewritten and remove old
stats.
- multiColStats = msdb.getTableColumnStatistics(catName, dbName,
tableName, oldColNames);
- if (multiColStats.isEmpty()) {
- updateColumnStats = false;
- } else {
- for (ColumnStatistics colStats : multiColStats) {
- List<ColumnStatisticsObj> statsObjs = colStats.getStatsObj();
- if (statsObjs != null) {
- // for out para, this value is initialized by caller.
- if (deletedCols == null) {
- deletedCols = new ArrayList<>();
+ if (statsObjs != null) {
+ for (ColumnStatisticsObj statsObj : statsObjs) {
+ boolean found = newTableCols.stream().anyMatch(c ->
statsObj.getColName().equalsIgnoreCase(c.getName()) &&
Review Comment:
can't we reuse filterColumnStatsForTableColumns by supplying negative
condition?
--
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]
