diff --git metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index f7b2ed7..7b62aa2 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -866,7 +866,7 @@ private void addAdminUsers_core() throws MetaException { Iterator users = Splitter.on(",").trimResults().omitEmptyStrings().split(userStr).iterator(); if (!users.hasNext()) { LOG.info("No user is added in admin role, since config value "+ userStr + - " is in incorrect format. We accept comma seprated list of users."); + " is in incorrect format. We accept comma separated list of users."); return; } Role adminRole; @@ -4603,7 +4603,7 @@ private Index add_index_core(final RawStore ms, final Index index, final Table i Table origTbl = ms.getTable(index.getDbName(), index.getOrigTableName()); if (origTbl == null) { throw new InvalidObjectException( - "Unable to add index because database or the orginal table do not exist"); + "Unable to add index because database or the original table do not exist"); } // set create time @@ -5344,7 +5344,7 @@ public boolean grant_role(final String roleName, incrementCounter("add_role_member"); firePreEvent(new PreAuthorizationCallEvent(this)); if (PUBLIC.equals(roleName)) { - throw new MetaException("No user can be added to " + PUBLIC +". Since all users implictly" + throw new MetaException("No user can be added to " + PUBLIC +". Since all users implicitly" + " belong to " + PUBLIC + " role."); } Boolean ret = null; @@ -5405,7 +5405,7 @@ public boolean create_role(final Role role) incrementCounter("create_role"); firePreEvent(new PreAuthorizationCallEvent(this)); if (PUBLIC.equals(role.getRoleName())) { - throw new MetaException(PUBLIC + " role implictly exists. It can't be created."); + throw new MetaException(PUBLIC + " role implicitly exists. It can't be created."); } Boolean ret = null; try { @@ -7300,7 +7300,7 @@ public void run() { try { Thread.sleep(1000); } catch (InterruptedException e) { - LOG.warn("Signalling thread was interuppted: " + e.getMessage()); + LOG.warn("Signalling thread was interrupted: " + e.getMessage()); } } while (!server.isServing()); startLock.lock(); diff --git metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java index d4024d2..e88774d 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java @@ -7879,7 +7879,7 @@ private synchronized void checkSchema() throws MetaException { } else { LOG.error("Version information found in metastore differs " + dbSchemaVer + " from expected schema version " + hiveSchemaVer + - ". Schema verififcation is disabled " + + ". Schema verification is disabled " + HiveConf.ConfVars.METASTORE_SCHEMA_VERIFICATION); setMetaStoreSchemaVersion(hiveSchemaVer, "Set by MetaStore " + USER + "@" + HOSTNAME); diff --git metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseImport.java metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseImport.java index b005b4e..16cfcf0 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseImport.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseImport.java @@ -330,7 +330,7 @@ private void copyTables() throws MetaException, InvalidObjectException, Interrup // Put tables from the databases we copied into the queue for (Database db : dbs) { - screen("Coyping tables in database " + db.getName()); + screen("Copying tables in database " + db.getName()); for (String tableName : rdbmsStore.get().getAllTables(db.getName())) { tableNameQueue.put(new String[]{db.getName(), tableName}); } @@ -389,7 +389,7 @@ private void copyIndexes() throws MetaException, InvalidObjectException, Interru // Put indexes from the databases we copied into the queue for (Database db : dbs) { - screen("Coyping indexes in database " + db.getName()); + screen("Copying indexes in database " + db.getName()); for (String tableName : rdbmsStore.get().getAllTables(db.getName())) { for (Index index : rdbmsStore.get().getIndexes(db.getName(), tableName, -1)) { indexNameQueue.put(new String[]{db.getName(), tableName, index.getIndexName()}); diff --git metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java index f9fad4c..22c9032 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/hbase/HBaseStore.java @@ -780,7 +780,7 @@ public boolean dropIndex(String dbName, String origTableName, String indexName) return indexes; } catch (IOException e) { LOG.error("Unable to get indexes", e); - throw new MetaException("Error scanning indexxes"); + throw new MetaException("Error scanning indexes"); } finally { commitOrRoleBack(commit); } diff --git metastore/src/java/org/apache/hadoop/hive/metastore/hbase/StatsCache.java metastore/src/java/org/apache/hadoop/hive/metastore/hbase/StatsCache.java index 18f8afc..1ba5904 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/hbase/StatsCache.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/hbase/StatsCache.java @@ -315,7 +315,7 @@ public void run() { try { sleep(runInvalidatorEvery - (System.currentTimeMillis() - startedAt)); } catch (InterruptedException e) { - LOG.warn("Interupted while sleeping", e); + LOG.warn("Interrupted while sleeping", e); } } } diff --git metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java index b0fa836..ecd43da 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java @@ -2397,7 +2397,7 @@ private LockResponse checkLock(Connection dbConn, long extLockId) String msg = "Aborting " + JavaUtils.txnIdToString(writeSet.get(0).txnId) + " since a concurrent committed transaction [" + JavaUtils.txnIdToString(rs.getLong(4)) + "," + rs.getLong(5) + - "] has already updated resouce '" + resourceName + "'"; + "] has already updated resource '" + resourceName + "'"; LOG.info(msg); if(abortTxns(dbConn, Collections.singletonList(writeSet.get(0).txnId), true) != 1) { throw new IllegalStateException(msg + " FAILED!"); diff --git service/src/java/org/apache/hive/service/cli/GetInfoValue.java service/src/java/org/apache/hive/service/cli/GetInfoValue.java index 2b2359c..bf3c6b2 100644 --- service/src/java/org/apache/hive/service/cli/GetInfoValue.java +++ service/src/java/org/apache/hive/service/cli/GetInfoValue.java @@ -52,7 +52,7 @@ public GetInfoValue(TGetInfoValue tGetInfoValue) { stringValue = tGetInfoValue.getStringValue(); break; default: - throw new IllegalArgumentException("Unreconigzed TGetInfoValue"); + throw new IllegalArgumentException("Unrecognized TGetInfoValue"); } } diff --git service/src/java/org/apache/hive/service/cli/operation/GetColumnsOperation.java service/src/java/org/apache/hive/service/cli/operation/GetColumnsOperation.java index c075179..3a65642 100644 --- service/src/java/org/apache/hive/service/cli/operation/GetColumnsOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/GetColumnsOperation.java @@ -100,7 +100,7 @@ "Schema of table that is the scope of a reference attribute " + "(null if the DATA_TYPE isn't REF)") .addPrimitiveColumn("SCOPE_TABLE", Type.STRING_TYPE, - "Table name that this the scope of a reference attribure " + "Table name that this the scope of a reference attribute " + "(null if the DATA_TYPE isn't REF)") .addPrimitiveColumn("SOURCE_DATA_TYPE", Type.SMALLINT_TYPE, "Source type of a distinct type or user-generated Ref type, " diff --git service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java index 80a615d..0b45cb6 100644 --- service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java +++ service/src/java/org/apache/hive/service/cli/operation/SQLOperation.java @@ -124,7 +124,7 @@ public SQLOperation(HiveSession parentSession, String statement, Map