From fb5323fd9511a71086ef3ae4d14986c03b548ff5 Mon Sep 17 00:00:00 2001 From: Syed Albiz Date: Mon, 15 Aug 2011 14:39:49 -0700 Subject: [PATCH 1/1] stuff with the stuff diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java index 80ae004..c031f40 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java @@ -830,8 +830,6 @@ public class DDLTask extends Task implements Serializable { if (alterIndex.getOp() == AlterIndexDesc.AlterIndexTypes.ADDPROPS) { idx.getParameters().putAll(alterIndex.getProps()); - } else if (alterIndex.getOp() == AlterIndexDesc.AlterIndexTypes.RENAMECOLS) { - idx.getSd().setCols(alterIndex.getSd().getCols()); } else { console.printError("Unsupported Alter commnad"); return 1; diff --git ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java index fd8d7ec..223adcc 100644 --- ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java +++ ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java @@ -467,7 +467,7 @@ public class Table implements Serializable { tTable.getSd().setSortCols(sortOrder); } - public boolean isField(String col) { + private boolean isField(String col) { for (FieldSchema field : getCols()) { if (field.getName().equals(col)) { return true; diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java index 80cef74..3054f76 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java @@ -276,7 +276,6 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer { case HiveParser.TOK_ALTERTABLE_UNARCHIVE: analyzeAlterTableArchive(ast, true); break; - //TODO: update index data case HiveParser.TOK_ALTERTABLE_ADDCOLS: analyzeAlterTableModifyCols(ast, AlterTableTypes.ADDCOLS); break; @@ -1674,31 +1673,8 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer { unescapeIdentifier(ast.getChild(1).getText()), unescapeIdentifier(ast .getChild(2).getText()), newType, newComment, first, flagCol); - - List indexAlterDescs = new ArrayList(); try { Table tab = db.getTable(db.getCurrentDatabase(), tblName, false); - if (conf.getBoolVar(HiveConf.ConfVars.HIVEINDEXAUTOUPDATE)) { - List tblIndexes = tab.getAllIndexes((short)-1); - for (Index index : tblIndexes) { - Table indexTable = db.getTable(db.getCurrentDatabase(), index.getIndexTableName(), false); - if (indexTable.isField(unescapeIdentifier(ast.getChild(1).getText()))) { - // only update the index if the index field would go stale - inputs.add(new ReadEntity(indexTable)); - outputs.add(new WriteEntity(indexTable)); - AlterIndexDesc id = new AlterIndexDesc(AlterIndexTypes.RENAMECOLS); - id.setIndexName(index.getIndexName()); - id.setSd(index.getSd()); - id.setBaseTableName(index.getOrigTableName()); - id.setDbName(db.getCurrentDatabase()); - indexAlterDescs.add(id); - /*new AlterTableDesc(indexTable.getTableName(), - unescapeIdentifier(ast.getChild(1).getText()), unescapeIdentifier(ast - .getChild(2).getText()), newType, newComment, first, flagCol), id); - //*/ - } - } - } if (tab != null) { inputs.add(new ReadEntity(tab)); outputs.add(new WriteEntity(tab)); @@ -1707,18 +1683,8 @@ public class DDLSemanticAnalyzer extends BaseSemanticAnalyzer { throw new SemanticException(ErrorMsg.INVALID_TABLE.getMsg(tblName)); } - Task rootTask = TaskFactory.get(new DDLWork(getInputs(), getOutputs(), - alterTblDesc), conf); - rootTasks.add(rootTask); - if (indexAlterDescs != null && indexAlterDescs.size() > 0) { - for (AlterIndexDesc indexAlterDesc : indexAlterDescs) { - Task tt = TaskFactory.get(new DDLWork(getInputs(), getOutputs(), - indexAlterDesc), conf); - rootTask.addDependentTask(tt); - //tt.addDependentTask(TaskFactory.get(new DDLWork(getInputs(), - // getOutputs(), indexAlterDescs.get(indexAlterDesc)), conf)); - } - } + rootTasks.add(TaskFactory.get(new DDLWork(getInputs(), getOutputs(), + alterTblDesc), conf)); } private void analyzeAlterTableModifyCols(ASTNode ast, diff --git ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java index 85278b3..cf20b89 100644 --- ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java +++ ql/src/java/org/apache/hadoop/hive/ql/plan/AlterIndexDesc.java @@ -24,7 +24,6 @@ import java.util.HashMap; import java.util.List; import org.apache.hadoop.hive.metastore.api.FieldSchema; -import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.Order; import org.apache.hadoop.hive.ql.exec.Utilities; @@ -38,7 +37,6 @@ public class AlterIndexDesc extends DDLDesc implements Serializable { private String indexName; private String baseTable; private String dbName; - private StorageDescriptor sd; private HashMap props; /** @@ -46,7 +44,6 @@ public class AlterIndexDesc extends DDLDesc implements Serializable { * */ public static enum AlterIndexTypes { - RENAMECOLS, ADDPROPS}; AlterIndexTypes op; @@ -83,21 +80,6 @@ public class AlterIndexDesc extends DDLDesc implements Serializable { } /** - * @param sd the storage descriptor to alter - */ - public void setSd(StorageDescriptor sd) { - this.sd = sd; - } - - /** - * @param sd the storage descriptor to alter - */ - @Explain(displayName = "new storage descriptor") - public StorageDescriptor getSd() { - return this.sd; - } - - /** * @param baseTable * the baseTable to set */ -- 1.7.4.4