Repository: sentry Updated Branches: refs/heads/master 1c77f5d3b -> 514a3b1bf
SENTRY-2200: Migrate 3.x Datanucleus unsupported configurations to 4.1 Datanucleus (Xinran Tinney, reviewed by Sergio Pena) Change-Id: Ic13ee08549be15248bde8e2c21ec72050e51e164 Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/514a3b1b Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/514a3b1b Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/514a3b1b Branch: refs/heads/master Commit: 514a3b1bfdb7d2f2b7967f779dd91bc24af1bd79 Parents: 1c77f5d Author: Sergio Pena <[email protected]> Authored: Fri Apr 20 13:21:54 2018 -0500 Committer: Sergio Pena <[email protected]> Committed: Fri Apr 20 13:21:54 2018 -0500 ---------------------------------------------------------------------- .../sentry/provider/db/service/persistent/SentryStore.java | 2 -- .../org/apache/sentry/service/thrift/ServiceConstants.java | 8 +++----- .../db/generic/service/persistent/TestSentryRole.java | 2 -- .../sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/514a3b1b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java index 83c0fc4..8ac3c0d 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/service/persistent/SentryStore.java @@ -270,8 +270,6 @@ public class SentryStore { if (!checkSchemaVersion) { prop.setProperty("datanucleus.schema.autoCreateAll", "true"); - prop.setProperty("datanucleus.autoCreateSchema", "true"); - prop.setProperty("datanucleus.fixedDatastore", "false"); } pmf = JDOHelper.getPersistenceManagerFactory(prop); tm = new TransactionManager(pmf, conf); http://git-wip-us.apache.org/repos/asf/sentry/blob/514a3b1b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java index 7e02874..a66d91e 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/ServiceConstants.java @@ -148,13 +148,11 @@ public class ServiceConstants { public static final ImmutableMap<String, String> SENTRY_STORE_DEFAULTS = ImmutableMap.<String, String>builder() .put("datanucleus.connectionPoolingType", "BoneCP") - .put("datanucleus.validateTables", "false") - .put("datanucleus.validateColumns", "false") - .put("datanucleus.validateConstraints", "false") + .put("datanucleus.schema.validateTables", "false") + .put("datanucleus.schema.validateColumns", "false") + .put("datanucleus.schema.validateConstraints", "false") .put("datanucleus.storeManagerType", "rdbms") .put("datanucleus.schema.autoCreateAll", "false") - .put("datanucleus.autoCreateSchema", "false") - .put("datanucleus.fixedDatastore", "true") .put("datanucleus.autoStartMechanismMode", "checked") .put(DATANUCLEUS_ISOLATION_LEVEL, DATANUCLEUS_REPEATABLE_READ) .put("datanucleus.cache.level2", "false") http://git-wip-us.apache.org/repos/asf/sentry/blob/514a3b1b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestSentryRole.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestSentryRole.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestSentryRole.java index 61a74c3..ebbb526 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestSentryRole.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/generic/service/persistent/TestSentryRole.java @@ -64,8 +64,6 @@ public class TestSentryRole { prop.setProperty(ServerConfig.JAVAX_JDO_PASS, "Sentry"); prop.setProperty(ServerConfig.JAVAX_JDO_DRIVER_NAME, "org.apache.derby.jdbc.EmbeddedDriver"); prop.setProperty("datanucleus.schema.autoCreateAll", "true"); - prop.setProperty("datanucleus.autoCreateSchema", "true"); - prop.setProperty("datanucleus.fixedDatastore", "false"); prop.setProperty("datanucleus.NontransactionalRead", "false"); prop.setProperty("datanucleus.NontransactionalWrite", "false"); pmf = JDOHelper.getPersistenceManagerFactory(prop); http://git-wip-us.apache.org/repos/asf/sentry/blob/514a3b1b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java ---------------------------------------------------------------------- diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java index 9b0aeb2..3b9d6b2 100644 --- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java +++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hdfs/TestHDFSIntegrationBase.java @@ -593,8 +593,7 @@ public abstract class TestHDFSIntegrationBase { hiveConf.set("javax.jdo.option.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver"); hiveConf.set("javax.jdo.option.ConnectionUserName", "hive"); hiveConf.set("javax.jdo.option.ConnectionPassword", "hive"); - hiveConf.set("datanucleus.autoCreateSchema", "true"); - hiveConf.set("datanucleus.fixedDatastore", "false"); + hiveConf.set("datanucleus.schema.autoCreateAll", "true"); hiveConf.set("datanucleus.autoStartMechanism", "SchemaTable"); hiveConf.set("datanucleus.schema.autoCreateTables", "true");
