You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by sp...@apache.org on 2018/06/20 15:12:24 UTC
sentry git commit: SENTRY-2271: Wrong log messages/method names in
SentrySchema related classes. (Arjun Mishra, reviewed by Sergio Pena)
Repository: sentry
Updated Branches:
refs/heads/master 86c12d64e -> 1e9c6626f
SENTRY-2271: Wrong log messages/method names in SentrySchema related classes. (Arjun Mishra, reviewed by Sergio Pena)
Project: http://git-wip-us.apache.org/repos/asf/sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/1e9c6626
Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/1e9c6626
Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/1e9c6626
Branch: refs/heads/master
Commit: 1e9c6626f3b9a40e9cdbfce712953168bffa530a
Parents: 86c12d6
Author: Sergio Pena <se...@cloudera.com>
Authored: Wed Jun 20 10:10:08 2018 -0500
Committer: Sergio Pena <se...@cloudera.com>
Committed: Wed Jun 20 10:10:08 2018 -0500
----------------------------------------------------------------------
.../persistent/SentryStoreSchemaInfo.java | 2 +-
.../sentry/cli/tools/SentrySchemaTool.java | 28 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sentry/blob/1e9c6626/sentry-service/sentry-service-server/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStoreSchemaInfo.java
----------------------------------------------------------------------
diff --git a/sentry-service/sentry-service-server/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStoreSchemaInfo.java b/sentry-service/sentry-service-server/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStoreSchemaInfo.java
index ce76a46..0d4f26c 100644
--- a/sentry-service/sentry-service-server/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStoreSchemaInfo.java
+++ b/sentry-service/sentry-service-server/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStoreSchemaInfo.java
@@ -84,7 +84,7 @@ public class SentryStoreSchemaInfo {
}
if (firstScript == sentrySchemaVersions.length) {
throw new SentryUserException("Unknown version specified for upgrade "
- + fromSchemaVer + " Metastore schema may be too old or newer");
+ + fromSchemaVer + " Sentry schema may be too old or newer");
}
for (int i = firstScript; i < sentrySchemaVersions.length; i++) {
http://git-wip-us.apache.org/repos/asf/sentry/blob/1e9c6626/sentry-tools/src/main/java/org/apache/sentry/cli/tools/SentrySchemaTool.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/cli/tools/SentrySchemaTool.java b/sentry-tools/src/main/java/org/apache/sentry/cli/tools/SentrySchemaTool.java
index c3ec5d6..4c3df20 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/cli/tools/SentrySchemaTool.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/cli/tools/SentrySchemaTool.java
@@ -150,15 +150,15 @@ public class SentrySchemaTool {
* @throws SentryUserException
*/
public void showInfo() throws SentryUserException {
- Connection sentryStoreConn = getConnectionToMetastore(true);
+ Connection sentryStoreConn = getConnectionToSentrystore(true);
System.out.println("Sentry distribution version:\t "
+ SentryStoreSchemaInfo.getSentryVersion());
System.out.println("SentryStore schema version:\t "
- + getMetaStoreSchemaVersion(sentryStoreConn));
+ + getSentrySchemaVersion(sentryStoreConn));
}
// read schema version from sentry store
- private String getMetaStoreSchemaVersion(Connection sentryStoreConn)
+ private String getSentrySchemaVersion(Connection sentryStoreConn)
throws SentryUserException {
String versionQuery;
if (SentrySchemaHelper.getDbCommandParser(dbType).needsQuotedIdentifier()) {
@@ -180,8 +180,8 @@ public class SentrySchemaTool {
}
// test the connection sentry store using the config property
- private void testConnectionToMetastore() throws SentryUserException {
- try (Connection conn = getConnectionToMetastore(true)) {
+ private void testConnectionToSentrystore() throws SentryUserException {
+ try (Connection conn = getConnectionToSentrystore(true)) {
conn.close();
} catch (SQLException e) {
throw new SentryUserException("Failed to close sentry store connection", e);
@@ -195,7 +195,7 @@ public class SentrySchemaTool {
* @return
* @throws SentryUserException
*/
- private Connection getConnectionToMetastore(boolean printInfo)
+ private Connection getConnectionToSentrystore(boolean printInfo)
throws SentryUserException {
if (printInfo) {
System.out.println("Sentry store connection URL:\t " + connectionURL);
@@ -223,7 +223,7 @@ public class SentrySchemaTool {
return;
}
String newSchemaVersion =
- getMetaStoreSchemaVersion(getConnectionToMetastore(false));
+ getSentrySchemaVersion(getConnectionToSentrystore(false));
// verify that the new version is added to schema
if (!sentryStoreSchemaInfo.getSentrySchemaVersion().equalsIgnoreCase(
newSchemaVersion)) {
@@ -237,12 +237,12 @@ public class SentrySchemaTool {
* @throws SentryUserException
*/
public void doUpgrade() throws SentryUserException {
- String fromVersion = getMetaStoreSchemaVersion(getConnectionToMetastore(false));
+ String fromVersion = getSentrySchemaVersion(getConnectionToSentrystore(false));
if (fromVersion == null || fromVersion.isEmpty()) {
throw new SentryUserException(
"Schema version not stored in the sentry store. "
+
- "Metastore schema is too old or corrupt. Try specifying the version manually");
+ "Sentry schema is too old or corrupt. Try specifying the version manually");
}
doUpgrade(fromVersion);
}
@@ -262,7 +262,7 @@ public class SentrySchemaTool {
// Find the list of scripts to execute for this upgrade
List<String> upgradeScripts =
sentryStoreSchemaInfo.getUpgradeScripts(fromSchemaVer);
- testConnectionToMetastore();
+ testConnectionToSentrystore();
System.out.println("Starting upgrade sentry store schema from version " +
fromSchemaVer + " to "
+ sentryStoreSchemaInfo.getSentrySchemaVersion());
@@ -277,7 +277,7 @@ public class SentrySchemaTool {
}
} catch (IOException eIO) {
throw new SentryUserException(
- "Upgrade FAILED! Metastore state would be inconsistent !!", eIO);
+ "Upgrade FAILED! Sentry store state would be inconsistent !!", eIO);
}
// Revalidated the new version after upgrade
@@ -304,7 +304,7 @@ public class SentrySchemaTool {
* @throws SentryUserException
*/
public void doInit(String toVersion) throws SentryUserException {
- testConnectionToMetastore();
+ testConnectionToSentrystore();
System.out.println("Starting sentry store schema initialization to " + toVersion);
String initScriptDir = sentryStoreSchemaInfo.getSentryStoreScriptDir();
@@ -318,7 +318,7 @@ public class SentrySchemaTool {
}
} catch (IOException e) {
throw new SentryUserException("Schema initialization FAILED!"
- + " Metastore state would be inconsistent !!", e);
+ + " Sentry store state would be inconsistent !!", e);
}
}
@@ -461,7 +461,7 @@ public class SentrySchemaTool {
.withDescription("Override config file password")
.create("passWord");
Option dbTypeOpt = OptionBuilder.withArgName("databaseType")
- .hasArg().withDescription("Metastore database type [" +
+ .hasArg().withDescription("Sentry store database type [" +
SentrySchemaHelper.DB_DERBY + "," +
SentrySchemaHelper.DB_MYSQL + "," +
SentrySchemaHelper.DB_ORACLE + "," +