diff --git ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java index 6399dbe..6013218 100644 --- ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java +++ ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.java @@ -247,6 +247,8 @@ TRUNCATE_FOR_NON_MANAGED_TABLE(10146, "Cannot truncate non-managed table {0}.", true), TRUNCATE_FOR_NON_NATIVE_TABLE(10147, "Cannot truncate non-native table {0}.", true), PARTSPEC_FOR_NON_PARTITIONED_TABLE(10148, "Partition spec for non partitioned table {0}.", true), + INVALID_TABLE_IN_ON_CLAUSE_OF_MERGE(10149, "No columns from target table ''{0}'' found in ON " + + "clause ''{1}'' of MERGE statement.", true), LOAD_INTO_STORED_AS_DIR(10195, "A stored-as-directories table cannot be used as target for LOAD"), ALTER_TBL_STOREDASDIR_NOT_SKEWED(10196, "This operation is only valid on skewed table."), diff --git ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java index f102786..e798328 100644 --- ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java +++ ql/src/java/org/apache/hadoop/hive/ql/parse/UpdateDeleteSemanticAnalyzer.java @@ -1205,6 +1205,15 @@ private void addColumn2Table(String tableName, String columnName) { private String getPredicate() { //normilize table name for mapping List targetCols = table2column.get(targetTableNameInSourceQuery.toLowerCase()); + if(targetCols == null) { + /*e.g. ON source.t=1 + * this is not strictly speaking invlaid but it does ensure that all columns from target + * table are all NULL for every row. This would make any WHEN MATCHED clause invalid since + * we don't have a ROW__ID. The WHEN NOT MATCHED could be meaningful but it's just data from + * source satisfying source.t=1... not worth the effort to support this*/ + throw new IllegalArgumentException(ErrorMsg.INVALID_TABLE_IN_ON_CLAUSE_OF_MERGE + .format(targetTableNameInSourceQuery, onClauseAsString)); + } StringBuilder sb = new StringBuilder(); for(String col : targetCols) { if(sb.length() > 0) { diff --git ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java index a90dd35..c110089 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java +++ ql/src/test/org/apache/hadoop/hive/ql/TestTxnCommands.java @@ -842,4 +842,13 @@ public void testSetClauseFakeColumn() throws Exception { Assert.assertEquals(ErrorMsg.INVALID_TARGET_COLUMN_IN_SET_CLAUSE, ((HiveException)cpr.getException()).getCanonicalErrorMsg()); } + @Test + public void testBadOnClause() throws Exception { + CommandProcessorResponse cpr = runStatementOnDriverNegative("merge into " + Table.ACIDTBL + + " trgt using (select * from " + Table.NONACIDORCTBL + + "src) sub on sub.a = target.a when not matched then insert values (sub.a,sub.b)"); + Assert.assertTrue("Error didn't match: " + cpr, cpr.getErrorMessage().contains( + "No columns from target table 'trgt' found in ON clause '`sub`.`a` = `target`.`a`' of MERGE statement.")); + + } }