You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/01/28 23:41:44 UTC
svn commit: r1655490 - in /hive/branches/branch-1.1: ./ data/files/grad.avsc
ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
ql/src/test/queries/clientpositive/compustat_avro.q
ql/src/test/results/clientpositive/compustat_avro.q.out
Author: brock
Date: Wed Jan 28 22:41:44 2015
New Revision: 1655490
URL: http://svn.apache.org/r1655490
Log:
Merge HIVE-6308 : COLUMNS_V2 Metastore table not populated for tables
Added:
hive/branches/branch-1.1/data/files/grad.avsc
- copied unchanged from r1655213, hive/trunk/data/files/grad.avsc
hive/branches/branch-1.1/ql/src/test/queries/clientpositive/compustat_avro.q
- copied unchanged from r1655213, hive/trunk/ql/src/test/queries/clientpositive/compustat_avro.q
hive/branches/branch-1.1/ql/src/test/results/clientpositive/compustat_avro.q.out
- copied unchanged from r1655213, hive/trunk/ql/src/test/results/clientpositive/compustat_avro.q.out
Modified:
hive/branches/branch-1.1/ (props changed)
hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 28 22:41:44 2015
@@ -3,4 +3,4 @@
/hive/branches/spark:1608589-1654414
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
-/hive/trunk:1655202,1655210
+/hive/trunk:1655202,1655210,1655213
Modified: hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1655490&r1=1655489&r2=1655490&view=diff
==============================================================================
--- hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (original)
+++ hive/branches/branch-1.1/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Wed Jan 28 22:41:44 2015
@@ -657,7 +657,7 @@ public class Hive {
if (tbl.getDbName() == null || "".equals(tbl.getDbName().trim())) {
tbl.setDbName(SessionState.get().getCurrentDatabase());
}
- if (tbl.getCols().size() == 0) {
+ if (tbl.getCols().size() == 0 || tbl.getSd().getColsSize() == 0) {
tbl.setFields(MetaStoreUtils.getFieldsFromDeserializer(tbl.getTableName(),
tbl.getDeserializer()));
}