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/03/07 20:00:40 UTC
svn commit: r1298041 [1/2] - in /hive/trunk: ./
cli/src/java/org/apache/hadoop/hive/cli/
common/src/java/org/apache/hadoop/hive/common/cli/
common/src/java/org/apache/hadoop/hive/common/metrics/
jdbc/src/java/org/apache/hadoop/hive/jdbc/ metastore/src/...
Author: hashutosh
Date: Wed Mar 7 19:00:38 2012
New Revision: 1298041
URL: http://svn.apache.org/viewvc?rev=1298041&view=rev
Log:
HIVE-2841: Fix javadoc warnings (Owen Omalley via hashutosh)
Modified:
hive/trunk/build.xml
hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/CommonCliOptions.java
hive/trunk/common/src/java/org/apache/hadoop/hive/common/metrics/MetricsMBean.java
hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDatabaseMetaData.java
hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HivePreparedStatement.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/AlterHandler.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MIndex.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MRegionStorageDescriptor.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java
hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java
hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExprNodeGenericFuncEvaluator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexHandler.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/IndexSearchCondition.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/MapJoinProcessor.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/index/RewriteParseContextGenerator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/lineage/LineageCtx.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/PhysicalPlanResolver.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveSemanticAnalyzerHookContext.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseContext.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/QBJoinTree.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLWork.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/DescDatabaseDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/DescTableDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MsckDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowPartitionsDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowTableStatusDesc.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/ppd/ExprWalkerInfo.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/HiveAuthorizationProvider.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/UDAFPercentile.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTF.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NGramEstimator.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/NumericHistogram.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarStructBase.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/columnar/LazyDecompressionCallback.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/io/TimestampWritable.java
hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/LazyBinaryUtils.java
hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandler.java
hive/trunk/shims/src/common/java/org/apache/hadoop/hive/io/HiveIOExceptionHandlerUtil.java
hive/trunk/shims/src/common/java/org/apache/hadoop/hive/shims/HadoopShims.java
Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Wed Mar 7 19:00:38 2012
@@ -687,7 +687,10 @@
<fileset dir="${hadoop.root}/lib">
<include name="**/*.jar" />
<exclude name="**/excluded/" />
+ <exclude name="**/commons-logging-*.jar" />
+ <exclude name="**/commons-codec-*.jar" />
</fileset>
+ <pathelement path="${hadoop.oldstyle-name.test.jar}"/>
<path refid="classpath" />
<pathelement path="${java.class.path}"/>
</classpath>
Modified: hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java
URL: http://svn.apache.org/viewvc/hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java (original)
+++ hive/trunk/cli/src/java/org/apache/hadoop/hive/cli/CliDriver.java Wed Mar 7 19:00:38 2012
@@ -346,7 +346,7 @@ public class CliDriver {
* @param allowInterupting
* When true the function will handle SIG_INT (Ctrl+C) by interrupting the processing and
* returning -1
- * @return
+ * @return 0 if ok
*/
public int processLine(String line, boolean allowInterupting) {
SignalHandler oldSignal = null;
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/CommonCliOptions.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/CommonCliOptions.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/CommonCliOptions.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/CommonCliOptions.java Wed Mar 7 19:00:38 2012
@@ -34,7 +34,9 @@ import org.apache.commons.cli.ParseExcep
* all your own options or processing instructions), parse, and then use
* the resulting information.
* <p>
- * See {@link HiveServer} or {@link HiveMetaStore} for examples of use.
+ * See {@link org.apache.hadoop.hive.service.HiveServer} or
+ * {@link org.apache.hadoop.hive.metastore.HiveMetaStore}
+ * for examples of use.
*
*/
public class CommonCliOptions {
@@ -55,10 +57,11 @@ public class CommonCliOptions {
/**
* Create an instance with common options (help, verbose, etc...).
*
+ * @param cliname the name of the command
* @param includeHiveConf include "hiveconf" as an option if true
*/
@SuppressWarnings("static-access")
- public CommonCliOptions(String cliname, boolean includeHiveconf) {
+ public CommonCliOptions(String cliname, boolean includeHiveConf) {
this.cliname = cliname;
// [-v|--verbose]
@@ -67,7 +70,7 @@ public class CommonCliOptions {
// [-h|--help]
OPTIONS.addOption(new Option("h", "help", false, "Print help information"));
- if (includeHiveconf) {
+ if (includeHiveConf) {
OPTIONS.addOption(OptionBuilder
.withValueSeparator()
.hasArgs(2)
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/common/metrics/MetricsMBean.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/common/metrics/MetricsMBean.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/common/metrics/MetricsMBean.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/common/metrics/MetricsMBean.java Wed Mar 7 19:00:38 2012
@@ -43,7 +43,7 @@ public interface MetricsMBean extends Dy
/**
*
* @param name
- * @return
+ * @return value associated with the key
* @throws Exception
*/
public abstract Object get(String name) throws IOException;
Modified: hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDatabaseMetaData.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDatabaseMetaData.java (original)
+++ hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HiveDatabaseMetaData.java Wed Mar 7 19:00:38 2012
@@ -389,7 +389,6 @@ public class HiveDatabaseMetaData implem
/**
* Returns the value of maxColumnNameLength.
*
- * @param int
*/
public int getMaxColumnNameLength() throws SQLException {
return maxColumnNameLength;
@@ -654,7 +653,7 @@ public class HiveDatabaseMetaData implem
/**
* Translate hive table types into jdbc table types.
* @param hivetabletype
- * @return
+ * @return the type of the table
*/
public static String toJdbcTableType(String hivetabletype) {
if (hivetabletype==null) {
Modified: hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HivePreparedStatement.java
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HivePreparedStatement.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HivePreparedStatement.java (original)
+++ hive/trunk/jdbc/src/java/org/apache/hadoop/hive/jdbc/HivePreparedStatement.java Wed Mar 7 19:00:38 2012
@@ -96,7 +96,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#addBatch()
*/
@@ -107,7 +107,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#clearParameters()
*/
@@ -121,7 +121,7 @@ public class HivePreparedStatement imple
* @return boolean Returns true if a resultSet is created, false if not.
* Note: If the result set is empty a true is returned.
*
- * @throws
+ * @throws SQLException
*/
public boolean execute() throws SQLException {
@@ -133,7 +133,7 @@ public class HivePreparedStatement imple
* Invokes executeQuery(sql) using the sql provided to the constructor.
*
* @return ResultSet
- * @throws
+ * @throws SQLException
*/
public ResultSet executeQuery() throws SQLException {
@@ -142,7 +142,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#executeUpdate()
*/
@@ -241,7 +241,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#getMetaData()
*/
@@ -252,7 +252,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#getParameterMetaData()
*/
@@ -263,7 +263,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setArray(int, java.sql.Array)
*/
@@ -274,7 +274,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setAsciiStream(int, java.io.InputStream)
*/
@@ -285,7 +285,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setAsciiStream(int, java.io.InputStream,
* int)
*/
@@ -297,7 +297,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setAsciiStream(int, java.io.InputStream,
* long)
*/
@@ -309,7 +309,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBigDecimal(int, java.math.BigDecimal)
*/
@@ -320,7 +320,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBinaryStream(int, java.io.InputStream)
*/
@@ -331,7 +331,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBinaryStream(int, java.io.InputStream,
* int)
*/
@@ -343,7 +343,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBinaryStream(int, java.io.InputStream,
* long)
*/
@@ -355,7 +355,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBlob(int, java.sql.Blob)
*/
@@ -366,7 +366,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBlob(int, java.io.InputStream)
*/
@@ -377,7 +377,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBlob(int, java.io.InputStream, long)
*/
@@ -389,7 +389,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBoolean(int, boolean)
*/
@@ -399,7 +399,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setByte(int, byte)
*/
@@ -409,7 +409,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setBytes(int, byte[])
*/
@@ -420,7 +420,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setCharacterStream(int, java.io.Reader)
*/
@@ -431,7 +431,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setCharacterStream(int, java.io.Reader,
* int)
*/
@@ -444,7 +444,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setCharacterStream(int, java.io.Reader,
* long)
*/
@@ -457,7 +457,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setClob(int, java.sql.Clob)
*/
@@ -468,7 +468,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setClob(int, java.io.Reader)
*/
@@ -479,7 +479,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setClob(int, java.io.Reader, long)
*/
@@ -490,7 +490,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setDate(int, java.sql.Date)
*/
@@ -501,7 +501,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setDate(int, java.sql.Date,
* java.util.Calendar)
*/
@@ -513,7 +513,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setDouble(int, double)
*/
@@ -523,7 +523,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setFloat(int, float)
*/
@@ -533,7 +533,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setInt(int, int)
*/
@@ -543,7 +543,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setLong(int, long)
*/
@@ -553,7 +553,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNCharacterStream(int, java.io.Reader)
*/
@@ -564,7 +564,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNCharacterStream(int, java.io.Reader,
* long)
*/
@@ -577,7 +577,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNClob(int, java.sql.NClob)
*/
@@ -588,7 +588,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNClob(int, java.io.Reader)
*/
@@ -599,7 +599,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNClob(int, java.io.Reader, long)
*/
@@ -610,7 +610,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNString(int, java.lang.String)
*/
@@ -621,7 +621,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNull(int, int)
*/
@@ -632,7 +632,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setNull(int, int, java.lang.String)
*/
@@ -643,7 +643,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setObject(int, java.lang.Object)
*/
@@ -654,7 +654,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setObject(int, java.lang.Object, int)
*/
@@ -666,7 +666,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setObject(int, java.lang.Object, int, int)
*/
@@ -678,7 +678,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setRef(int, java.sql.Ref)
*/
@@ -689,7 +689,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setRowId(int, java.sql.RowId)
*/
@@ -700,7 +700,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setSQLXML(int, java.sql.SQLXML)
*/
@@ -711,7 +711,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setShort(int, short)
*/
@@ -721,7 +721,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setString(int, java.lang.String)
*/
@@ -732,7 +732,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setTime(int, java.sql.Time)
*/
@@ -743,7 +743,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setTime(int, java.sql.Time,
* java.util.Calendar)
*/
@@ -755,7 +755,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setTimestamp(int, java.sql.Timestamp)
*/
@@ -766,7 +766,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setTimestamp(int, java.sql.Timestamp,
* java.util.Calendar)
*/
@@ -779,7 +779,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setURL(int, java.net.URL)
*/
@@ -790,7 +790,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.PreparedStatement#setUnicodeStream(int, java.io.InputStream,
* int)
*/
@@ -803,7 +803,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#addBatch(java.lang.String)
*/
@@ -814,7 +814,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#cancel()
*/
@@ -825,7 +825,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#clearBatch()
*/
@@ -836,7 +836,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#clearWarnings()
*/
@@ -847,7 +847,7 @@ public class HivePreparedStatement imple
/**
* Closes the prepared statement.
*
- * @throws
+ * @throws SQLException
*/
public void close() throws SQLException {
@@ -861,7 +861,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#execute(java.lang.String)
*/
@@ -872,7 +872,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#execute(java.lang.String, int)
*/
@@ -883,7 +883,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#execute(java.lang.String, int[])
*/
@@ -894,7 +894,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#execute(java.lang.String, java.lang.String[])
*/
@@ -905,7 +905,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeBatch()
*/
@@ -916,7 +916,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeQuery(java.lang.String)
*/
@@ -927,7 +927,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeUpdate(java.lang.String)
*/
@@ -938,7 +938,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeUpdate(java.lang.String, int)
*/
@@ -949,7 +949,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeUpdate(java.lang.String, int[])
*/
@@ -960,7 +960,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#executeUpdate(java.lang.String, java.lang.String[])
*/
@@ -971,7 +971,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getConnection()
*/
@@ -982,7 +982,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getFetchDirection()
*/
@@ -993,7 +993,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getFetchSize()
*/
@@ -1004,7 +1004,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getGeneratedKeys()
*/
@@ -1015,7 +1015,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getMaxFieldSize()
*/
@@ -1026,7 +1026,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getMaxRows()
*/
@@ -1036,7 +1036,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getMoreResults()
*/
@@ -1047,7 +1047,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getMoreResults(int)
*/
@@ -1058,7 +1058,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getQueryTimeout()
*/
@@ -1069,7 +1069,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getResultSet()
*/
@@ -1079,7 +1079,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getResultSetConcurrency()
*/
@@ -1090,7 +1090,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getResultSetHoldability()
*/
@@ -1101,7 +1101,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getResultSetType()
*/
@@ -1112,7 +1112,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getUpdateCount()
*/
@@ -1122,7 +1122,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#getWarnings()
*/
@@ -1132,7 +1132,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#isClosed()
*/
@@ -1142,7 +1142,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#isPoolable()
*/
@@ -1153,7 +1153,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setCursorName(java.lang.String)
*/
@@ -1164,7 +1164,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setEscapeProcessing(boolean)
*/
@@ -1175,7 +1175,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setFetchDirection(int)
*/
@@ -1186,7 +1186,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setFetchSize(int)
*/
@@ -1197,7 +1197,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setMaxFieldSize(int)
*/
@@ -1208,7 +1208,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setMaxRows(int)
*/
@@ -1221,7 +1221,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setPoolable(boolean)
*/
@@ -1232,7 +1232,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Statement#setQueryTimeout(int)
*/
@@ -1243,7 +1243,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Wrapper#isWrapperFor(java.lang.Class)
*/
@@ -1254,7 +1254,7 @@ public class HivePreparedStatement imple
/*
* (non-Javadoc)
- *
+ *
* @see java.sql.Wrapper#unwrap(java.lang.Class)
*/
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/AlterHandler.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/AlterHandler.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/AlterHandler.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/AlterHandler.java Wed Mar 7 19:00:38 2012
@@ -69,7 +69,7 @@ public interface AlterHandler extends Co
* original values of the partition being altered
* @param new_part
* new partition object
- * @return
+ * @return the altered partition
* @throws InvalidOperationException
* @throws InvalidObjectException
* @throws AlreadyExistsException
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Wed Mar 7 19:00:38 2012
@@ -290,7 +290,7 @@ public class HiveMetaStore extends Thrif
/**
* Get a cached RawStore.
*
- * @return
+ * @return the cached RawStore
* @throws MetaException
*/
@InterfaceAudience.LimitedPrivate({"HCATALOG"})
@@ -2873,7 +2873,7 @@ public class HiveMetaStore extends Thrif
*
* @param port
* @param bridge
- * @param hiveconf
+ * @param conf
* configuration overrides
* @throws Throwable
*/
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java Wed Mar 7 19:00:38 2012
@@ -164,8 +164,10 @@ public class HiveMetaStoreClient impleme
* @throws InvalidOperationException
* @throws MetaException
* @throws TException
- * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#alter_table(java.lang.String,
- * java.lang.String, org.apache.hadoop.hive.metastore.api.Table)
+ * @see
+ * org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#alter_table(
+ * java.lang.String, java.lang.String,
+ * org.apache.hadoop.hive.metastore.api.Table)
*/
public void alter_table(String dbname, String tbl_name, Table new_tbl)
throws InvalidOperationException, MetaException, TException {
@@ -333,7 +335,7 @@ public class HiveMetaStoreClient impleme
* @throws AlreadyExistsException
* @throws MetaException
* @throws TException
- * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#add_partitions(List<org.apache.hadoop.hive.metastore.api.Partition>)
+ * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#add_partitions(List)
*/
public int add_partitions(List<Partition> new_parts)
throws InvalidObjectException, AlreadyExistsException, MetaException,
@@ -369,13 +371,11 @@ public class HiveMetaStoreClient impleme
/**
* Create a new Database
* @param db
- * @return true or false
* @throws AlreadyExistsException
* @throws InvalidObjectException
* @throws MetaException
* @throws TException
- * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#create_database(java.lang.String,
- * java.lang.String)
+ * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#create_database(Database)
*/
public void createDatabase(Database db)
throws AlreadyExistsException, InvalidObjectException, MetaException, TException {
@@ -425,12 +425,11 @@ public class HiveMetaStoreClient impleme
/**
* @param name
- * @return true or false
* @throws NoSuchObjectException
* @throws InvalidOperationException
* @throws MetaException
* @throws TException
- * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#drop_database(java.lang.String)
+ * @see org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface#drop_database(java.lang.String, boolean, boolean)
*/
public void dropDatabase(String name)
throws NoSuchObjectException, InvalidOperationException, MetaException, TException {
@@ -842,7 +841,7 @@ public class HiveMetaStoreClient impleme
/**
* create an index
* @param index the index object
- * @param index table which stores the index data
+ * @param indexTable which stores the index data
* @throws InvalidObjectException
* @throws MetaException
* @throws NoSuchObjectException
@@ -873,7 +872,7 @@ public class HiveMetaStoreClient impleme
* @param dbName
* @param tblName
* @param indexName
- * @return
+ * @return the index
* @throws MetaException
* @throws UnknownTableException
* @throws NoSuchObjectException
@@ -887,10 +886,10 @@ public class HiveMetaStoreClient impleme
/**
* list indexes of the give base table
- * @param db_name
- * @param tbl_name
+ * @param dbName
+ * @param tblName
* @param max
- * @return
+ * @return the list of indexes
* @throws NoSuchObjectException
* @throws MetaException
* @throws TException
@@ -903,10 +902,10 @@ public class HiveMetaStoreClient impleme
/**
* list all the index names of the give base table.
*
- * @param db_name
- * @param tbl_name
+ * @param dbName
+ * @param tblName
* @param max
- * @return
+ * @return list of indexes
* @throws MetaException
* @throws TException
*/
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java Wed Mar 7 19:00:38 2012
@@ -126,11 +126,9 @@ public interface IMetaStoreClient {
*
* @param dbName
* The name of the database from which you will retrieve the table names
- * @param filterType
- * The type of filter
* @param filter
* The filter string
- * @param max_tables
+ * @param maxTables
* The maximum number of tables returned
* @return A list of table names that match the desired filter
*/
@@ -223,7 +221,7 @@ public interface IMetaStoreClient {
/**
* Get a Database Object
* @param databaseName name of the database to fetch
- * @return
+ * @return the database
* @throws NoSuchObjectException The database does not exist
* @throws MetaException Could not fetch the database
* @throws TException A thrift communication error occurred
@@ -361,7 +359,7 @@ public interface IMetaStoreClient {
* @param pvals
* @param userName
* @param groupNames
- * @return
+ * @return the partition
* @throws MetaException
* @throws UnknownTableException
* @throws NoSuchObjectException
@@ -417,7 +415,7 @@ public interface IMetaStoreClient {
* @param s
* @param userName
* @param groupNames
- * @return
+ * @return the list of partitions
* @throws NoSuchObjectException
*/
public List<Partition> listPartitionsWithAuthInfo(String dbName,
@@ -444,7 +442,7 @@ public interface IMetaStoreClient {
* @param s
* @param userName
* @param groupNames
- * @return
+ * @return the list of paritions
* @throws NoSuchObjectException
*/
public List<Partition> listPartitionsWithAuthInfo(String dbName,
@@ -657,7 +655,7 @@ public interface IMetaStoreClient {
* @param dbName
* @param tblName
* @param indexName
- * @return
+ * @return the index
* @throws MetaException
* @throws UnknownTableException
* @throws NoSuchObjectException
@@ -673,7 +671,7 @@ public interface IMetaStoreClient {
* @param db_name
* @param tbl_name
* @param max
- * @return
+ * @return the list of indexes
* @throws NoSuchObjectException
* @throws MetaException
* @throws TException
@@ -687,7 +685,7 @@ public interface IMetaStoreClient {
* @param db_name
* @param tbl_name
* @param max
- * @return
+ * @return the list of names
* @throws MetaException
* @throws TException
*/
@@ -699,7 +697,7 @@ public interface IMetaStoreClient {
* @param tbl_name
* @param name index name
* @param deleteData
- * @return
+ * @return true on success
* @throws NoSuchObjectException
* @throws MetaException
* @throws TException
@@ -709,9 +707,9 @@ public interface IMetaStoreClient {
MetaException, TException;
/**
- * @param Role
+ * @param role
* role object
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -721,9 +719,8 @@ public interface IMetaStoreClient {
/**
* @param role_name
* role name
- * @param db_name
*
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -731,7 +728,7 @@ public interface IMetaStoreClient {
/**
* list all role names
- * @return
+ * @return list of names
* @throws TException
* @throws MetaException
*/
@@ -745,7 +742,7 @@ public interface IMetaStoreClient {
* @param grantor
* @param grantorType
* @param grantOption
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -759,9 +756,8 @@ public interface IMetaStoreClient {
* @param user_name
* user name
* @param principalType
- * @param db_name
*
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -772,7 +768,7 @@ public interface IMetaStoreClient {
*
* @param principalName
* @param principalType
- * @return
+ * @return list of roles
* @throws MetaException
* @throws TException
*/
@@ -783,7 +779,7 @@ public interface IMetaStoreClient {
* @param hiveObject
* @param user_name
* @param group_names
- * @return
+ * @return the privilege set
* @throws MetaException
* @throws TException
*/
@@ -795,7 +791,7 @@ public interface IMetaStoreClient {
* @param principal_name
* @param principal_type
* @param hiveObject
- * @return
+ * @return list of privileges
* @throws MetaException
* @throws TException
*/
@@ -805,7 +801,7 @@ public interface IMetaStoreClient {
/**
* @param privileges
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -814,7 +810,7 @@ public interface IMetaStoreClient {
/**
* @param privileges
- * @return
+ * @return true on success
* @throws MetaException
* @throws TException
*/
@@ -824,7 +820,7 @@ public interface IMetaStoreClient {
/**
* @param owner the intended owner for the token
* @param renewerKerberosPrincipalName
- * @return
+ * @return the string of the token
* @throws MetaException
* @throws TException
*/
@@ -833,7 +829,7 @@ public interface IMetaStoreClient {
/**
* @param tokenStrForm
- * @return
+ * @return the new expiration time
* @throws MetaException
* @throws TException
*/
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreEventListener.java Wed Mar 7 19:00:38 2012
@@ -47,13 +47,13 @@ public abstract class MetaStoreEventList
}
/**
- * @param create table event.
+ * @param tableEvent table event.
* @throws MetaException
*/
public abstract void onCreateTable (CreateTableEvent tableEvent) throws MetaException;
/**
- * @param drop table event.
+ * @param tableEvent table event.
* @throws MetaException
*/
public abstract void onDropTable (DropTableEvent tableEvent) throws MetaException;
@@ -73,25 +73,25 @@ public abstract class MetaStoreEventList
public abstract void onAddPartition (AddPartitionEvent partitionEvent) throws MetaException;
/**
- * @param drop partition event
+ * @param partitionEvent partition event
* @throws MetaException
*/
public abstract void onDropPartition (DropPartitionEvent partitionEvent) throws MetaException;
/**
- * @param alter partition event
+ * @param partitionEvent partition event
* @throws MetaException
*/
public abstract void onAlterPartition (AlterPartitionEvent partitionEvent) throws MetaException;
/**
- * @param create database event
+ * @param dbEvent database event
* @throws MetaException
*/
public abstract void onCreateDatabase (CreateDatabaseEvent dbEvent) throws MetaException;
/**
- * @param drop database event
+ * @param dbEvent database event
* @throws MetaException
*/
public abstract void onDropDatabase (DropDatabaseEvent dbEvent) throws MetaException;
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreFS.java Wed Mar 7 19:00:38 2012
@@ -30,10 +30,10 @@ public interface MetaStoreFS {
/**
* delete a directory
- *
+ *
* @param f
* @param recursive
- * @return
+ * @return true on success
* @throws MetaException
*/
public boolean deleteDir(FileSystem fs, Path f, boolean recursive,
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java Wed Mar 7 19:00:38 2012
@@ -219,8 +219,9 @@ public class MetaStoreUtils {
*
* @param conf
* - hadoop config
- * @param partition
+ * @param part
* the partition
+ * @param table the table
* @return the Deserializer
* @exception MetaException
* if any problems instantiating the Deserializer
@@ -487,7 +488,7 @@ public class MetaStoreUtils {
* @param tableName table name
* @param partitionKeys partition columns
* @param tblSchema The table level schema from which this partition should be copied.
- * @return
+ * @return the properties
*/
public static Properties getPartSchemaFromTableSchema(
org.apache.hadoop.hive.metastore.api.StorageDescriptor sd,
@@ -942,7 +943,7 @@ public class MetaStoreUtils {
* Given a map of partition column names to values, this creates a filter
* string that can be used to call the *byFilter methods
* @param m
- * @return
+ * @return the filter string
*/
public static String makeFilterStringFromMap(Map<String, String> m) {
StringBuilder filter = new StringBuilder();
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java Wed Mar 7 19:00:38 2012
@@ -139,8 +139,6 @@ public interface RawStore extends Config
* Gets a list of tables based on a filter string and filter type.
* @param dbName
* The name of the database from which you will retrieve the table names
- * @param filterType
- * The type of filter
* @param filter
* The filter string
* @param max_tables
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/Warehouse.java Wed Mar 7 19:00:38 2012
@@ -283,7 +283,7 @@ public class Warehouse {
* Makes a partition name from a specification
* @param spec
* @param addTrailingSeperator if true, adds a trailing separator e.g. 'ds=1/'
- * @return
+ * @return partition name
* @throws MetaException
*/
public static String makePartName(Map<String, String> spec,
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/hooks/JDOConnectionURLHook.java Wed Mar 7 19:00:38 2012
@@ -33,7 +33,7 @@ public interface JDOConnectionURLHook {
* attempt.
*
* @param conf The configuration used to initialize this instance of the HMS
- * @return
+ * @return the connection URL
* @throws Exception
*/
public String getJdoConnectionUrl(Configuration conf)
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MDBPrivilege.java Wed Mar 7 19:00:38 2012
@@ -19,21 +19,21 @@
package org.apache.hadoop.hive.metastore.model;
public class MDBPrivilege {
-
+
private String principalName;
-
+
private String principalType;
-
+
private MDatabase database;
-
+
private int createTime;
-
+
private String privilege;
-
+
private String grantor;
-
+
private String grantorType;
-
+
private boolean grantOption;
public MDBPrivilege() {
@@ -75,12 +75,12 @@ public class MDBPrivilege {
}
/**
- * @param dbPrivileges a set of privileges this user/role/group has
+ * @param dbPrivilege a set of privileges this user/role/group has
*/
public void setPrivilege(String dbPrivilege) {
this.privilege = dbPrivilege;
}
-
+
public MDatabase getDatabase() {
return database;
}
@@ -96,7 +96,7 @@ public class MDBPrivilege {
public void setCreateTime(int createTime) {
this.createTime = createTime;
}
-
+
public String getGrantor() {
return grantor;
}
@@ -104,7 +104,7 @@ public class MDBPrivilege {
public void setGrantor(String grantor) {
this.grantor = grantor;
}
-
+
public String getGrantorType() {
return grantorType;
}
@@ -120,7 +120,7 @@ public class MDBPrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getPrincipalType() {
return principalType;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MGlobalPrivilege.java Wed Mar 7 19:00:38 2012
@@ -19,25 +19,25 @@
package org.apache.hadoop.hive.metastore.model;
/**
- * User global level privileges
+ * User global level privileges
*/
public class MGlobalPrivilege {
//principal name, can be a user, group, or role
private String principalName;
-
+
private String principalType;
-
+
private String privilege;
-
+
private int createTime;
-
+
private String grantor;
-
+
private String grantorType;
-
+
private boolean grantOption;
-
+
public MGlobalPrivilege() {
super();
}
@@ -63,12 +63,12 @@ public class MGlobalPrivilege {
}
/**
- * @param dbPrivileges set of global privileges to user
+ * @param dbPrivilege set of global privileges to user
*/
public void setPrivilege(String dbPrivilege) {
this.privilege = dbPrivilege;
}
-
+
public String getPrincipalName() {
return principalName;
}
@@ -92,7 +92,7 @@ public class MGlobalPrivilege {
public void setGrantor(String grantor) {
this.grantor = grantor;
}
-
+
public boolean getGrantOption() {
return grantOption;
}
@@ -100,7 +100,7 @@ public class MGlobalPrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getPrincipalType() {
return principalType;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MIndex.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MIndex.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MIndex.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MIndex.java Wed Mar 7 19:00:38 2012
@@ -24,7 +24,7 @@ import java.util.Map;
* Represents hive's index definition.
*/
public class MIndex {
-
+
private String indexName;
private MTable origTable;
private int createTime;
@@ -36,15 +36,17 @@ public class MIndex {
private boolean deferredRebuild;
public MIndex() {}
-
+
/**
* @param indexName
- * @param orignialTable
+ * @param baseTable
* @param createTime
* @param lastAccessTime
* @param parameters
* @param indexTable
* @param sd
+ * @param indexHandlerClass
+ * @param deferredRebuild
*/
public MIndex(String indexName, MTable baseTable, int createTime,
int lastAccessTime, Map<String, String> parameters, MTable indexTable,
@@ -146,7 +148,7 @@ public class MIndex {
public void setIndexTable(MTable indexTable) {
this.indexTable = indexTable;
}
-
+
/**
* @return storage descriptor
*/
@@ -174,14 +176,14 @@ public class MIndex {
public void setIndexHandlerClass(String indexHandlerClass) {
this.indexHandlerClass = indexHandlerClass;
}
-
+
/**
* @return auto rebuild
*/
public boolean isDeferredRebuild() {
return deferredRebuild;
}
-
+
/**
* @return auto rebuild
*/
@@ -190,7 +192,7 @@ public class MIndex {
}
/**
- * @param autoRebuild
+ * @param deferredRebuild
*/
public void setDeferredRebuild(boolean deferredRebuild) {
this.deferredRebuild = deferredRebuild;
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionColumnPrivilege.java Wed Mar 7 19:00:38 2012
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.metastore
public class MPartitionColumnPrivilege {
- private String principalName;
+ private String principalName;
private String principalType;
@@ -32,25 +32,26 @@ public class MPartitionColumnPrivilege {
private String privilege;
private int createTime;
-
+
private String grantor;
-
+
private String grantorType;
-
+
private boolean grantOption;
public MPartitionColumnPrivilege() {
}
-
+
/**
* @param principalName
- * @param isRole
- * @param isGroup
+ * @param principalType
* @param partition
* @param columnName
* @param privileges
* @param createTime
* @param grantor
+ * @param grantorType
+ * @param grantOption
*/
public MPartitionColumnPrivilege(String principalName, String principalType,
MPartition partition, String columnName, String privileges, int createTime,
@@ -66,7 +67,7 @@ public class MPartitionColumnPrivilege {
this.grantorType = grantorType;
this.grantOption = grantOption;
}
-
+
/**
* @return column name
*/
@@ -132,7 +133,7 @@ public class MPartitionColumnPrivilege {
public void setGrantor(String grantor) {
this.grantor = grantor;
}
-
+
public String getGrantorType() {
return grantorType;
}
@@ -140,7 +141,7 @@ public class MPartitionColumnPrivilege {
public void setGrantorType(String grantorType) {
this.grantorType = grantorType;
}
-
+
public boolean getGrantOption() {
return grantOption;
}
@@ -148,7 +149,7 @@ public class MPartitionColumnPrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getPrincipalType() {
return principalType;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionEvent.java Wed Mar 7 19:00:38 2012
@@ -64,7 +64,7 @@ public class MPartitionEvent {
}
/**
- * @param eventTime the eventTime to set
+ * @param createTime the eventTime to set
*/
public void setEventTime(long createTime) {
this.eventTime = createTime;
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MPartitionPrivilege.java Wed Mar 7 19:00:38 2012
@@ -19,23 +19,23 @@
package org.apache.hadoop.hive.metastore.model;
public class MPartitionPrivilege {
-
+
private String principalName;
-
+
private String principalType;
private MPartition partition;
-
+
private String privilege;
-
+
private int createTime;
-
+
private String grantor;
-
+
private String grantorType;
private boolean grantOption;
-
+
public MPartitionPrivilege() {
}
@@ -75,7 +75,7 @@ public class MPartitionPrivilege {
public void setPrivilege(String dbPrivilege) {
this.privilege = dbPrivilege;
}
-
+
/**
* @return create time
*/
@@ -91,7 +91,7 @@ public class MPartitionPrivilege {
}
/**
- * @return
+ * @return the grantor
*/
public String getGrantor() {
return grantor;
@@ -119,7 +119,7 @@ public class MPartitionPrivilege {
public void setPartition(MPartition partition) {
this.partition = partition;
}
-
+
public boolean getGrantOption() {
return grantOption;
}
@@ -127,7 +127,7 @@ public class MPartitionPrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getGrantorType() {
return grantorType;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MRegionStorageDescriptor.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MRegionStorageDescriptor.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MRegionStorageDescriptor.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MRegionStorageDescriptor.java Wed Mar 7 19:00:38 2012
@@ -48,7 +48,7 @@ public class MRegionStorageDescriptor im
}
/**
- * @param region
+ * @param regionName
*/
public void setRegionName(String regionName) {
this.regionName = regionName;
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTableColumnPrivilege.java Wed Mar 7 19:00:38 2012
@@ -20,36 +20,37 @@ package org.apache.hadoop.hive.metastore
public class MTableColumnPrivilege {
- private String principalName;
+ private String principalName;
private String principalType;
private MTable table;
-
+
private String columnName;
private String privilege;
private int createTime;
-
+
private String grantor;
-
+
private String grantorType;
-
+
private boolean grantOption;
public MTableColumnPrivilege() {
}
-
+
/**
* @param principalName
- * @param isRole
- * @param isGroup
+ * @param principalType
* @param table
* @param columnName
* @param privileges
* @param createTime
* @param grantor
+ * @param grantorType
+ * @param grantOption
*/
public MTableColumnPrivilege(String principalName, String principalType,
MTable table, String columnName, String privileges, int createTime,
@@ -65,7 +66,7 @@ public class MTableColumnPrivilege {
this.grantorType = grantorType;
this.grantOption = grantOption;
}
-
+
/**
* @return column name
*/
@@ -123,7 +124,7 @@ public class MTableColumnPrivilege {
public void setTable(MTable table) {
this.table = table;
}
-
+
public String getGrantor() {
return grantor;
}
@@ -131,7 +132,7 @@ public class MTableColumnPrivilege {
public void setGrantor(String grantor) {
this.grantor = grantor;
}
-
+
public String getGrantorType() {
return grantorType;
}
@@ -139,7 +140,7 @@ public class MTableColumnPrivilege {
public void setGrantorType(String grantorType) {
this.grantorType = grantorType;
}
-
+
public boolean getGrantOption() {
return grantOption;
}
@@ -147,7 +148,7 @@ public class MTableColumnPrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getPrincipalType() {
return principalType;
}
Modified: hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java (original)
+++ hive/trunk/metastore/src/model/org/apache/hadoop/hive/metastore/model/MTablePrivilege.java Wed Mar 7 19:00:38 2012
@@ -19,23 +19,23 @@
package org.apache.hadoop.hive.metastore.model;
public class MTablePrivilege {
-
+
private String principalName;
-
+
private String principalType;
private MTable table;
-
+
private String privilege;
-
+
private int createTime;
-
+
private String grantor;
-
+
private String grantorType;
private boolean grantOption;
-
+
public MTablePrivilege() {
}
@@ -75,7 +75,7 @@ public class MTablePrivilege {
public void setPrivilege(String dbPrivilege) {
this.privilege = dbPrivilege;
}
-
+
/**
* @return create time
*/
@@ -91,7 +91,7 @@ public class MTablePrivilege {
}
/**
- * @return
+ * @return the grantor
*/
public String getGrantor() {
return grantor;
@@ -127,7 +127,7 @@ public class MTablePrivilege {
public void setGrantOption(boolean grantOption) {
this.grantOption = grantOption;
}
-
+
public String getGrantorType() {
return grantorType;
}
Modified: hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java (original)
+++ hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/DummyListener.java Wed Mar 7 19:00:38 2012
@@ -35,7 +35,7 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.events.LoadPartitionDoneEvent;
/** A dummy implementation for
- * {@link org.apache.hadoop.hive.metastore.hadooorg.apache.hadoop.hive.metastore.MetaStoreEventListener}
+ * {@link org.apache.hadoop.hive.metastore.MetaStoreEventListener}
* for testing purposes.
*/
public class DummyListener extends MetaStoreEventListener{
Modified: hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java (original)
+++ hive/trunk/metastore/src/test/org/apache/hadoop/hive/metastore/TestMetaStoreEventListener.java Wed Mar 7 19:00:38 2012
@@ -47,7 +47,7 @@ import org.apache.hadoop.hive.ql.session
/**
* TestMetaStoreEventListener. Test case for
- * {@link org.apache.hadoop.hive.metastore.hadooorg.apache.hadoop.hive.metastore.MetaStoreEventListener}
+ * {@link org.apache.hadoop.hive.metastore.MetaStoreEventListener}
*/
public class TestMetaStoreEventListener extends TestCase {
private static final String msPort = "20001";
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Wed Mar 7 19:00:38 2012
@@ -387,7 +387,7 @@ public class Driver implements CommandPr
* is useful for generating re-entrant QL queries.
* @param command The HiveQL query to compile
* @param resetTaskIds Resets taskID counter if true.
- * @return
+ * @return 0 for ok
*/
public int compile(String command, boolean resetTaskIds) {
PerfLogger perfLogger = PerfLogger.getPerfLogger();
@@ -1264,9 +1264,8 @@ public class Driver implements CommandPr
* name of the task, if it is a map-reduce job
* @param jobs
* number of map-reduce jobs
- * @param curJobNo
- * the sequential number of the next map-reduce job
- * @return the updated number of last the map-reduce job launched
+ * @param cxt
+ * the driver context
*/
public void launchTask(Task<? extends Serializable> tsk, String queryId, boolean noName,
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ArchiveUtils.java Wed Mar 7 19:00:38 2012
@@ -47,7 +47,7 @@ import org.apache.hadoop.hive.ql.metadat
@SuppressWarnings("nls")
public final class ArchiveUtils {
private static final Log LOG = LogFactory.getLog(ArchiveUtils.class.getName());
-
+
public static String ARCHIVING_LEVEL = "archiving_level";
/**
@@ -91,7 +91,7 @@ public final class ArchiveUtils {
prefixFields.add(fs);
prefixValues.add(partSpec.get(fs.getName()));
}
-
+
return new PartSpecInfo(prefixFields, prefixValues);
}
@@ -229,7 +229,7 @@ public final class ArchiveUtils {
* Determines whether a partition has been archived
*
* @param p
- * @return
+ * @return is it archived?
*/
public static boolean isArchived(Partition p) {
Map<String, String> params = p.getParameters();
@@ -264,12 +264,12 @@ public final class ArchiveUtils {
* argument, level, is used for the prefix length. For example, partition
* (ds='2010-01-01', hr='00', min='00'), level 1 will reture 'ds=2010-01-01',
* and level 2 will return 'ds=2010-01-01/hr=00'.
- *
+ *
* @param p
* partition object
* @param level
* level for prefix depth
- * @return
+ * @return prefix of partition's string representation
* @throws HiveException
*/
public static String getPartialName(Partition p, int level) throws HiveException {
@@ -315,7 +315,7 @@ public final class ArchiveUtils {
public static String conflictingArchiveNameOrNull(Hive db, Table tbl,
LinkedHashMap<String, String> partSpec)
throws HiveException {
-
+
List<FieldSchema> partKeys = tbl.getPartitionKeys();
int partSpecLevel = 0;
for (FieldSchema partKey : partKeys) {
@@ -324,7 +324,7 @@ public final class ArchiveUtils {
}
partSpecLevel++;
}
-
+
if(partSpecLevel != partSpec.size()) {
throw new HiveException("partspec " + partSpec
+ " is wrong for table " + tbl.getTableName());
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExecMapperContext.java Wed Mar 7 19:00:38 2012
@@ -74,7 +74,7 @@ public class ExecMapperContext {
* after the input file changed. This is first introduced to process bucket
* map join.
*
- * @return
+ * @return is the input file changed?
*/
public boolean inputFileChanged() {
if (!inputFileChecked) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExprNodeGenericFuncEvaluator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExprNodeGenericFuncEvaluator.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExprNodeGenericFuncEvaluator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/ExprNodeGenericFuncEvaluator.java Wed Mar 7 19:00:38 2012
@@ -170,7 +170,7 @@ public class ExprNodeGenericFuncEvaluato
* If the genericUDF is not a base comparison, or there is an error executing the comparison, it
* returns null.
* @param row
- * @return
+ * @return the compare results
* @throws HiveException
*/
public Integer compare(Object row) throws HiveException {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java Wed Mar 7 19:00:38 2012
@@ -716,7 +716,9 @@ public final class FunctionRegistry {
*
* @param name
* the name of the UDAF
- * @param argumentTypeInfos
+ * @param argumentOIs
+ * @param isDistinct
+ * @param isAllColumns
* @return The UDAF evaluator
*/
@SuppressWarnings("deprecation")
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/HadoopJobExecHelper.java Wed Mar 7 19:00:38 2012
@@ -100,7 +100,7 @@ public class HadoopJobExecHelper {
* this msg pattern is used to track when a job is successfully done.
*
* @param jobId
- * @return
+ * @return the job end message
*/
public static String getJobEndMsg(String jobId) {
return "Ended Job = " + jobId;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java Wed Mar 7 19:00:38 2012
@@ -1336,8 +1336,6 @@ public final class Utilities {
/**
* Remove all temporary files and duplicate (double-committed) files from a given directory.
- *
- * @return a list of path names corresponding to should-be-created empty buckets.
*/
public static void removeTempOrDuplicateFiles(FileSystem fs, Path path) throws IOException {
removeTempOrDuplicateFiles(fs, path, null);
@@ -1645,8 +1643,8 @@ public final class Utilities {
/**
* Calculate the total size of input files.
*
- * @param job
- * the hadoop job conf.
+ * @param ctx
+ * the hadoop job context
* @param work
* map reduce job plan
* @param filter
@@ -2113,10 +2111,10 @@ public final class Utilities {
* is a SQLRecoverableException or SQLNonTransientException. For SQLRecoverableException
* the caller needs to reconnect to the database and restart the whole transaction.
*
- * @param query the prepared statement of SQL.
- * @param type either SQLCommandType.QUERY or SQLCommandType.UPDATE
+ * @param cmd the SQL command
+ * @param stmt the prepared statement of SQL.
* @param baseWindow The base time window (in milliseconds) before the next retry.
- * see {@getRandomWaitTime} for details.
+ * see {@link #getRandomWaitTime} for details.
* @param maxRetries the maximum # of retries when getting a SQLTransientException.
* @throws SQLException throws SQLRecoverableException or SQLNonTransientException the
* first time it is caught, or SQLTransientException when the maxRetries has reached.
@@ -2157,8 +2155,8 @@ public final class Utilities {
* the caller needs to reconnect to the database and restart the whole transaction.
*
* @param connectionString the JDBC connection string.
- * @param baseWindow The base time window (in milliseconds) before the next retry.
- * see {@getRandomWaitTime} for details.
+ * @param waitWindow The base time window (in milliseconds) before the next retry.
+ * see {@link #getRandomWaitTime} for details.
* @param maxRetries the maximum # of retries when getting a SQLTransientException.
* @throws SQLException throws SQLRecoverableException or SQLNonTransientException the
* first time it is caught, or SQLTransientException when the maxRetries has reached.
@@ -2199,8 +2197,8 @@ public final class Utilities {
*
* @param conn a JDBC connection.
* @param stmt the SQL statement to be prepared.
- * @param baseWindow The base time window (in milliseconds) before the next retry.
- * see {@getRandomWaitTime} for details.
+ * @param waitWindow The base time window (in milliseconds) before the next retry.
+ * see {@link #getRandomWaitTime} for details.
* @param maxRetries the maximum # of retries when getting a SQLTransientException.
* @throws SQLException throws SQLRecoverableException or SQLNonTransientException the
* first time it is caught, or SQLTransientException when the maxRetries has reached.
@@ -2252,13 +2250,13 @@ public final class Utilities {
baseWindow * (failures + 1) * r.nextDouble()); // expanding time window for each failure
}
+ public static final char sqlEscapeChar = '\\';
+
/**
* Escape the '_', '%', as well as the escape characters inside the string key.
* @param key the string that will be used for the SQL LIKE operator.
- * @param escape the escape character
* @return a string with escaped '_' and '%'.
*/
- public static final char sqlEscapeChar = '\\';
public static String escapeSqlLike(String key) {
StringBuffer sb = new StringBuffer(key.length());
for (char c: key.toCharArray()) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinDoubleKeys.java Wed Mar 7 19:00:38 2012
@@ -40,8 +40,8 @@ public class MapJoinDoubleKeys extends A
}
/**
- * @param metadataTag
- * @param obj
+ * @param obj1
+ * @param obj2
*/
public MapJoinDoubleKeys(Object obj1, Object obj2) {
this.obj1 = obj1;
@@ -148,7 +148,7 @@ public class MapJoinDoubleKeys extends A
}
/**
- * @param obj
+ * @param obj1
* the obj to set
*/
public void setObj1(Object obj1) {
@@ -163,7 +163,7 @@ public class MapJoinDoubleKeys extends A
}
/**
- * @param obj
+ * @param obj2
* the obj to set
*/
public void setObj2(Object obj2) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinObjectKey.java Wed Mar 7 19:00:38 2012
@@ -42,7 +42,6 @@ public class MapJoinObjectKey extends A
}
/**
- * @param metadataTag
* @param obj
*/
public MapJoinObjectKey(Object[] obj) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/persistence/MapJoinSingleKey.java Wed Mar 7 19:00:38 2012
@@ -39,7 +39,6 @@ public class MapJoinSingleKey extends Ab
}
/**
- * @param metadataTag
* @param obj
*/
public MapJoinSingleKey(Object obj) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/history/HiveHistory.java Wed Mar 7 19:00:38 2012
@@ -352,8 +352,9 @@ public class HiveHistory {
/**
* Serialize the task counters and set as a task property.
*
+ * @param queryId
* @param taskId
- * @param rj
+ * @param ctrs
*/
public void setTaskCounters(String queryId, String taskId, Counters ctrs) {
String id = queryId + ":" + taskId;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/LineageInfo.java Wed Mar 7 19:00:38 2012
@@ -350,7 +350,7 @@ public class LineageInfo implements Seri
}
/**
- * @param basecols the baseCols to set
+ * @param baseCols the baseCols to set
*/
public void setBaseCols(List<BaseColumnInfo> baseCols) {
this.baseCols = baseCols;
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexHandler.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexHandler.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexHandler.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/HiveIndexHandler.java Wed Mar 7 19:00:38 2012
@@ -40,7 +40,7 @@ public interface HiveIndexHandler extend
/**
* Determines whether this handler implements indexes by creating an index
* table.
- *
+ *
* @return true if index creation implies creation of an index table in Hive;
* false if the index representation is not stored in a Hive table
*/
@@ -49,13 +49,13 @@ public interface HiveIndexHandler extend
/**
* Requests that the handler validate an index definition and fill in
* additional information about its stored representation.
- *
+ *
* @param baseTable
* the definition of the table being indexed
- *
+ *
* @param index
* the definition of the index being created
- *
+ *
* @param indexTable
* a partial definition of the index table to be used for storing the
* index representation, or null if usesIndexTable() returns false;
@@ -63,9 +63,9 @@ public interface HiveIndexHandler extend
* information about input/output format) and/or the index table's
* definition (typically with additional columns containing the index
* representation, e.g. pointers into HDFS).
- *
- * @throw HiveException if the index definition is invalid with respect to
- * either the base table or the supplied index table definition
+ *
+ * @throws HiveException if the index definition is invalid with respect to
+ * either the base table or the supplied index table definition
*/
void analyzeIndexDefinition(
org.apache.hadoop.hive.metastore.api.Table baseTable,
@@ -76,38 +76,32 @@ public interface HiveIndexHandler extend
/**
* Requests that the handler generate a plan for building the index; the plan
* should read the base table and write out the index representation.
- *
- * @param outputs
- * @param inputs
- *
- * @param baseTable
+ *
+ * @param baseTbl
* the definition of the table being indexed
- *
+ *
* @param index
* the definition of the index
- *
- * @param indexTblPartitions
- * list of index partitions
- *
+ *
* @param baseTblPartitions
* list of base table partitions with each element mirrors to the
* corresponding one in indexTblPartitions
- *
- * @param indexTable
+ *
+ * @param indexTbl
* the definition of the index table, or null if usesIndexTable()
* returns null
- *
+ *
* @param inputs
- * inputs for hooks, supplemental outputs going
+ * inputs for hooks, supplemental outputs going
* along with the return value
- *
+ *
* @param outputs
- * outputs for hooks, supplemental outputs going
+ * outputs for hooks, supplemental outputs going
* along with the return value
- *
+ *
* @return list of tasks to be executed in parallel for building the index
- *
- * @throw HiveException if plan generation fails
+ *
+ * @throws HiveException if plan generation fails
*/
List<Task<?>> generateIndexBuildTaskList(
org.apache.hadoop.hive.ql.metadata.Table baseTbl,
@@ -123,11 +117,11 @@ public interface HiveIndexHandler extend
* provided, it is up to the handler whether to use none, one, some or all of
* them. The supplied predicate may reference any of the columns from any of
* the indexes. If the handler decides to use more than one index, it is
- * responsible for generating tasks to combine their search results
+ * responsible for generating tasks to combine their search results
* (e.g. performing a JOIN on the result).
* @param indexes
* @param predicate
- * @param parseContext
+ * @param pctx
* @param queryContext contains results, such as query tasks and input configuration
*/
void generateIndexQuery(List<Index> indexes, ExprNodeDesc predicate,
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/IndexSearchCondition.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/IndexSearchCondition.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/IndexSearchCondition.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/index/IndexSearchCondition.java Wed Mar 7 19:00:38 2012
@@ -44,7 +44,7 @@ public class IndexSearchCondition
*
* @param constantDesc constant value to search for
*
- * @Param comparisonExpr the original comparison expression
+ * @param comparisonExpr the original comparison expression
*/
public IndexSearchCondition(
ExprNodeColumnDesc columnDesc,
@@ -61,7 +61,7 @@ public class IndexSearchCondition
public void setColumnDesc(ExprNodeColumnDesc columnDesc) {
this.columnDesc = columnDesc;
}
-
+
public ExprNodeColumnDesc getColumnDesc() {
return columnDesc;
}
@@ -89,7 +89,7 @@ public class IndexSearchCondition
public ExprNodeDesc getComparisonExpr() {
return comparisonExpr;
}
-
+
@Override
public String toString() {
return comparisonExpr.getExprString();
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/HiveContextAwareRecordReader.java Wed Mar 7 19:00:38 2012
@@ -333,7 +333,7 @@ public abstract class HiveContextAwareRe
/**
* Returns true if the current comparison is in the list of stop comparisons, i.e. we've found
* all records which won't be filtered
- * @return
+ * @return true if the current comparison is found
*/
public boolean foundAllTargets() {
if (this.getIOContext().getComparison() == null ||
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java?rev=1298041&r1=1298040&r2=1298041&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/AuthorizationException.java Wed Mar 7 19:00:38 2012
@@ -30,8 +30,8 @@ public class AuthorizationException exte
/**
* Constructs an {@link AuthorizationException} with the specified detail
* message.
- *
- * @param s
+ *
+ * @param message
* the detail message.
*/
public AuthorizationException(String message) {
@@ -40,7 +40,7 @@ public class AuthorizationException exte
/**
* Constructs an {@link AuthorizationException} with the specified cause.
- *
+ *
* @param cause
* the cause
*/