diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 11c3121..8f1af64 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -324,7 +324,8 @@ METASTORE_TRANSACTION_ISOLATION("datanucleus.transactionIsolation", "read-committed"), METASTORE_CACHE_LEVEL2("datanucleus.cache.level2", false), METASTORE_CACHE_LEVEL2_TYPE("datanucleus.cache.level2.type", "none"), - METASTORE_IDENTIFIER_FACTORY("datanucleus.identifierFactory", "datanucleus"), + METASTORE_IDENTIFIER_FACTORY("datanucleus.identifierFactory", "datanucleus1"), + METASTORE_USE_LEGACY_VALUE_STRATEGY("datanucleus.rdbms.useLegacyNativeValueStrategy", true), METASTORE_PLUGIN_REGISTRY_BUNDLE_CHECK("datanucleus.plugin.pluginRegistryBundleCheck", "LOG"), METASTORE_BATCH_RETRIEVE_MAX("hive.metastore.batch.retrieve.max", 300), METASTORE_BATCH_RETRIEVE_TABLE_PARTITION_MAX( @@ -353,7 +354,7 @@ METASTORE_CONNECTION_DRIVER("javax.jdo.option.ConnectionDriverName", "org.apache.derby.jdbc.EmbeddedDriver"), METASTORE_MANAGER_FACTORY_CLASS("javax.jdo.PersistenceManagerFactoryClass", - "org.datanucleus.jdo.JDOPersistenceManagerFactory"), + "org.datanucleus.api.jdo.JDOPersistenceManagerFactory"), METASTORE_DETACH_ALL_ON_COMMIT("javax.jdo.option.DetachAllOnCommit", true), METASTORE_NON_TRANSACTIONAL_READ("javax.jdo.option.NonTransactionalRead", true), METASTORE_CONNECTION_USER_NAME("javax.jdo.option.ConnectionUserName", "APP"), diff --git conf/hive-default.xml.template conf/hive-default.xml.template index 603b475..9ba85d9 100644 --- conf/hive-default.xml.template +++ conf/hive-default.xml.template @@ -141,7 +141,7 @@ javax.jdo.PersistenceManagerFactoryClass - org.datanucleus.jdo.JDOPersistenceManagerFactory + org.datanucleus.api.jdo.JDOPersistenceManagerFactory class implementing the jdo persistence @@ -237,8 +237,8 @@ datanucleus.identifierFactory - datanucleus - Name of the identifier factory to use when generating table/column names etc. 'datanucleus' is used for backward compatibility + datanucleus1 + Name of the identifier factory to use when generating table/column names etc. 'datanucleus1' is used for backward compatibility with DataNucleus v1 diff --git ivy/libraries.properties ivy/libraries.properties index 0e1b992..4a8edce 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -24,10 +24,9 @@ antlr.version=3.4 antlr-runtime.version=3.4 asm.version=3.1 avro.version=1.7.1 -datanucleus-connectionpool.version=2.0.3 -datanucleus-core.version=2.0.3 -datanucleus-enhancer.version=2.0.3 -datanucleus-rdbms.version=2.0.3 +datanucleus-api-jdo.version=3.2.1 +datanucleus-core.version=3.2.2 +datanucleus-rdbms.version=3.2.1 checkstyle.version=5.0 findbugs.version=1.3.9 BoneCP.version=0.7.1.RELEASE diff --git metastore/build.xml metastore/build.xml index 0e94611..40d4d7f 100755 --- metastore/build.xml +++ metastore/build.xml @@ -81,7 +81,7 @@ + classname="org.datanucleus.enhancer.EnhancerTask"> diff --git metastore/ivy.xml metastore/ivy.xml index 356e19d..1fff03c 100644 --- metastore/ivy.xml +++ metastore/ivy.xml @@ -33,11 +33,12 @@ conf="compile->default" /> - - - + + + + + diff --git metastore/src/model/package.jdo metastore/src/model/package.jdo index a84d2bf..40f6564 100644 --- metastore/src/model/package.jdo +++ metastore/src/model/package.jdo @@ -57,13 +57,13 @@ - + - + - + @@ -201,7 +201,7 @@ - + @@ -262,7 +262,9 @@ - + + + diff --git ql/ivy.xml ql/ivy.xml index bfb3116..0e3022a 100644 --- ql/ivy.xml +++ ql/ivy.xml @@ -51,6 +51,15 @@ + + + + + + + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index cbda70b..5fe0d74 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -123,9 +123,9 @@ import org.apache.hadoop.hive.ql.plan.PartitionDesc; import org.apache.hadoop.hive.ql.plan.PlanUtils; import org.apache.hadoop.hive.ql.plan.PlanUtils.ExpressionTypes; +import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.ql.plan.api.Adjacency; import org.apache.hadoop.hive.ql.plan.api.Graph; -import org.apache.hadoop.hive.ql.plan.TableDesc; import org.apache.hadoop.hive.ql.session.SessionState; import org.apache.hadoop.hive.ql.stats.StatsFactory; import org.apache.hadoop.hive.ql.stats.StatsPublisher; @@ -507,8 +507,8 @@ public void exceptionThrown(Exception e) { e.setPersistenceDelegate(GroupByDesc.Mode.class, new EnumDelegate()); e.setPersistenceDelegate(Operator.ProgressCounter.class, new EnumDelegate()); - e.setPersistenceDelegate(org.datanucleus.sco.backed.Map.class, new MapDelegate()); - e.setPersistenceDelegate(org.datanucleus.sco.backed.List.class, new ListDelegate()); + e.setPersistenceDelegate(org.datanucleus.store.types.backed.Map.class, new MapDelegate()); + e.setPersistenceDelegate(org.datanucleus.store.types.backed.List.class, new ListDelegate()); e.writeObject(plan); e.close();