diff --git conf/hive-default.xml conf/hive-default.xml index 683b417..a01496c 100644 --- conf/hive-default.xml +++ conf/hive-default.xml @@ -120,7 +120,7 @@ javax.jdo.PersistenceManagerFactoryClass - org.datanucleus.jdo.JDOPersistenceManagerFactory + org.datanucleus.api.jdo.JDOPersistenceManagerFactory class implementing the jdo persistence @@ -216,8 +216,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 adde3cb..1f9cad1 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -22,10 +22,11 @@ ant-task.version=2.0.10 antlr.version=3.0.1 antlr-runtime.version=3.0.1 asm.version=3.1 +datanucleus-api-jdo.version=3.0.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-core.version=3.0.1 +datanucleus-enhancer.version=3.0.0-release +datanucleus-rdbms.version=3.0.1 checkstyle.version=5.0 commons-cli.version=1.2 commons-codec.version=1.3 diff --git metastore/ivy.xml metastore/ivy.xml index 2e5331d..0ba7fae 100644 --- metastore/ivy.xml +++ metastore/ivy.xml @@ -42,6 +42,11 @@ + + + + + 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 983e1d5..7b12f55 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -464,8 +464,8 @@ public final class Utilities { 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.sco.backed.Map.class, new MapDelegate()); + e.setPersistenceDelegate(org.datanucleus.store.types.sco.backed.List.class, new ListDelegate()); e.writeObject(plan); e.close();