You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/04/20 20:07:44 UTC
svn commit: r1328469 [10/10] - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/conf/ conf/
contrib/src/test/results/clientnegative/
contrib/src/test/results/clientpositive/ metastore/if/
metastore/scripts/upgrade/derby/ metastore/scripts/upgrade...
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Fri Apr 20 18:07:41 2012
@@ -7980,8 +7980,6 @@ public class SemanticAnalyzer extends Ba
RowFormatParams rowFormatParams = new RowFormatParams();
StorageFormat storageFormat = new StorageFormat();
AnalyzeCreateCommonVars shared = new AnalyzeCreateCommonVars();
- String defaultRegionName =
- HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_DEFAULT_REGION_NAME);
LOG.info("Creating table " + tableName + " position="
+ ast.getCharPositionInLine());
@@ -8120,9 +8118,7 @@ public class SemanticAnalyzer extends Ba
bucketCols, sortCols, numBuckets, rowFormatParams.fieldDelim, rowFormatParams.fieldEscape,
rowFormatParams.collItemDelim, rowFormatParams.mapKeyDelim, rowFormatParams.lineDelim, comment,
storageFormat.inputFormat, storageFormat.outputFormat, location, shared.serde,
- storageFormat.storageHandler, shared.serdeProps,
- tblProps, ifNotExists,
- defaultRegionName);
+ storageFormat.storageHandler, shared.serdeProps, tblProps, ifNotExists);
validateCreateTable(crtTblDesc);
// outputs is empty, which means this create table happens in the current
@@ -8164,8 +8160,7 @@ public class SemanticAnalyzer extends Ba
bucketCols, sortCols, numBuckets, rowFormatParams.fieldDelim, rowFormatParams.fieldEscape,
rowFormatParams.collItemDelim, rowFormatParams.mapKeyDelim, rowFormatParams.lineDelim, comment, storageFormat.inputFormat,
storageFormat.outputFormat, location, shared.serde, storageFormat.storageHandler, shared.serdeProps,
- tblProps, ifNotExists,
- defaultRegionName);
+ tblProps, ifNotExists);
qb.setTableDesc(crtTblDesc);
SessionState.get().setCommandType(HiveOperation.CREATETABLE_AS_SELECT);
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java Fri Apr 20 18:07:41 2012
@@ -56,7 +56,6 @@ public class CreateTableDesc extends DDL
Map<String, String> serdeProps;
Map<String, String> tblProps;
boolean ifNotExists;
- String primaryRegionName;
public CreateTableDesc() {
}
@@ -70,14 +69,13 @@ public class CreateTableDesc extends DDL
String storageHandler,
Map<String, String> serdeProps,
Map<String, String> tblProps,
- boolean ifNotExists,
- String primaryRegionName) {
+ boolean ifNotExists) {
this(tableName, isExternal, cols, partCols,
bucketCols, sortCols, numBuckets, fieldDelim, fieldEscape,
collItemDelim, mapKeyDelim, lineDelim, comment, inputFormat,
outputFormat, location, serName, storageHandler, serdeProps,
- tblProps, ifNotExists, primaryRegionName);
+ tblProps, ifNotExists);
this.databaseName = databaseName;
}
@@ -91,8 +89,7 @@ public class CreateTableDesc extends DDL
String storageHandler,
Map<String, String> serdeProps,
Map<String, String> tblProps,
- boolean ifNotExists,
- String primaryRegionName) {
+ boolean ifNotExists) {
this.tableName = tableName;
this.isExternal = isExternal;
this.bucketCols = new ArrayList<String>(bucketCols);
@@ -114,7 +111,6 @@ public class CreateTableDesc extends DDL
this.serdeProps = serdeProps;
this.tblProps = tblProps;
this.ifNotExists = ifNotExists;
- this.primaryRegionName = primaryRegionName;
}
@Explain(displayName = "columns")
@@ -346,19 +342,4 @@ public class CreateTableDesc extends DDL
this.tblProps = tblProps;
}
- /**
- * @return the primaryRegionName
- */
- @Explain(displayName = "primaryRegionName")
- public String getPrimaryRegionName() {
- return primaryRegionName;
- }
-
- /**
- * @param primaryRegionName
- * the primaryRegionName to set
- */
- public void setPrimaryRegionName(String primaryRegionName) {
- this.primaryRegionName = primaryRegionName;
- }
}
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java Fri Apr 20 18:07:41 2012
@@ -33,7 +33,6 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.Warehouse;
import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
-import org.apache.hadoop.hive.metastore.api.RegionStorageDescriptor;
import org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat;
import org.apache.hadoop.hive.serde.Constants;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
@@ -136,9 +135,6 @@ public class TestHive extends TestCase {
tbl.setSerdeParam(Constants.FIELD_DELIM, "1");
tbl.setSerializationLib(LazySimpleSerDe.class.getName());
- tbl.getTTable().getSd().setPrimaryRegionName(HiveConf.ConfVars.HIVE_DEFAULT_REGION_NAME.defaultVal);
- tbl.getTTable().getSd().setSecondaryRegions(new ArrayList<RegionStorageDescriptor>());
-
// create table
try {
hm.createTable(tbl);
@@ -213,11 +209,6 @@ public class TestHive extends TestCase {
tbl.setSerdeParam(Constants.SERIALIZATION_CLASS, Complex.class.getName());
tbl.setSerdeParam(Constants.SERIALIZATION_FORMAT, TBinaryProtocol.class
.getName());
-
- tbl.getTTable().getSd().setPrimaryRegionName(HiveConf.ConfVars.HIVE_DEFAULT_REGION_NAME.defaultVal);
- tbl.getTTable().getSd().setSecondaryRegions(new ArrayList<RegionStorageDescriptor>());
-
-
try {
hm.createTable(tbl);
} catch (HiveException e) {
Modified: hive/trunk/ql/src/test/results/clientpositive/create_union_table.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/create_union_table.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/create_union_table.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/create_union_table.q.out Fri Apr 20 18:07:41 2012
@@ -19,7 +19,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: abc
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/ctas.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ctas.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ctas.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ctas.q.out Fri Apr 20 18:07:41 2012
@@ -104,7 +104,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: nzhang_CTAS1
isExternal: false
@@ -264,7 +263,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: nzhang_ctas2
isExternal: false
@@ -424,7 +422,6 @@ STAGE PLANS:
input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- primaryRegionName:
serde name: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
name: nzhang_ctas3
isExternal: false
@@ -653,7 +650,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: nzhang_ctas4
isExternal: false
@@ -897,7 +893,6 @@ STAGE PLANS:
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: nzhang_ctas5
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/fileformat_sequencefile.q.out Fri Apr 20 18:07:41 2012
@@ -23,7 +23,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.SequenceFileInputFormat
# buckets: -1
output format: org.apache.hadoop.mapred.SequenceFileOutputFormat
- primaryRegionName:
name: dest1
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/fileformat_text.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/fileformat_text.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/fileformat_text.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/fileformat_text.q.out Fri Apr 20 18:07:41 2012
@@ -23,7 +23,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: dest1
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/input15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input15.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input15.q.out Fri Apr 20 18:07:41 2012
@@ -20,7 +20,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: TEST15
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/inputddl1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/inputddl1.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/inputddl1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/inputddl1.q.out Fri Apr 20 18:07:41 2012
@@ -19,7 +19,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: INPUTDDL1
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/inputddl2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/inputddl2.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/inputddl2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/inputddl2.q.out Fri Apr 20 18:07:41 2012
@@ -20,7 +20,6 @@ STAGE PLANS:
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
partition columns: ds string, country string
- primaryRegionName:
name: INPUTDDL2
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/inputddl3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/inputddl3.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/inputddl3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/inputddl3.q.out Fri Apr 20 18:07:41 2012
@@ -20,7 +20,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: INPUTDDL3
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/merge3.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/merge3.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/merge3.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/merge3.q.out Fri Apr 20 18:07:41 2012
@@ -164,7 +164,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: merge_src2
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/rcfile_createas1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/rcfile_createas1.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/rcfile_createas1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/rcfile_createas1.q.out Fri Apr 20 18:07:41 2012
@@ -114,7 +114,6 @@ STAGE PLANS:
input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
- primaryRegionName:
serde name: org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe
name: rcfile_createas1b
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out Fri Apr 20 18:07:41 2012
@@ -126,7 +126,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: smb_mapjoin9_results
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/symlink_text_input_format.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/symlink_text_input_format.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/symlink_text_input_format.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/symlink_text_input_format.q.out Fri Apr 20 18:07:41 2012
@@ -19,7 +19,6 @@ STAGE PLANS:
input format: org.apache.hadoop.hive.ql.io.SymlinkTextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: symlink_text_input_format
isExternal: false
Modified: hive/trunk/ql/src/test/results/clientpositive/union25.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/union25.q.out?rev=1328469&r1=1328468&r2=1328469&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/union25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/union25.q.out Fri Apr 20 18:07:41 2012
@@ -286,7 +286,6 @@ STAGE PLANS:
input format: org.apache.hadoop.mapred.TextInputFormat
# buckets: -1
output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
- primaryRegionName:
name: tmp_unionall
isExternal: false