diff --git a/pom.xml b/pom.xml index d0fe683..f1c9e98 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 1.0b3 - 3.3.0-release + 4.0.0-release 1.7 2.3 2.12.1 @@ -102,9 +102,9 @@ 1.7.7 0.8.0.RELEASE 1.3.0-incubating - 3.2.6 - 3.2.10 - 3.2.9 + 4.1.0-release + 4.1.1 + 4.1.1 1.2 1.4 1.4.1 @@ -134,7 +134,7 @@ 2.4.2 0.3.2 5.5.1 - 3.0.1 + 3.1 7.6.0.v20120127 1.14 2.12 @@ -178,19 +178,6 @@ - datanucleus - datanucleus maven repository - http://www.datanucleus.org/downloads/maven2 - default - - true - warn - - - false - - - glassfish-repository http://maven.glassfish.org/content/groups/glassfish diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java index 024e05c..49e8707 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java @@ -525,33 +525,6 @@ protected boolean mutatesTo(Object oldInstance, Object newInstance) { } } - public static class MapDelegate extends DefaultPersistenceDelegate { - @Override - protected Expression instantiate(Object oldInstance, Encoder out) { - Map oldMap = (Map) oldInstance; - HashMap newMap = new HashMap(oldMap); - return new Expression(newMap, HashMap.class, "new", new Object[] {}); - } - - @Override - protected boolean mutatesTo(Object oldInstance, Object newInstance) { - return false; - } - - @Override - protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { - java.util.Collection oldO = (java.util.Collection) oldInstance; - java.util.Collection newO = (java.util.Collection) newInstance; - - if (newO.size() != 0) { - out.writeStatement(new Statement(oldInstance, "clear", new Object[] {})); - } - for (Iterator i = oldO.iterator(); i.hasNext();) { - out.writeStatement(new Statement(oldInstance, "add", new Object[] {i.next()})); - } - } - } - public static class SetDelegate extends DefaultPersistenceDelegate { @Override protected Expression instantiate(Object oldInstance, Encoder out) { @@ -580,34 +553,6 @@ protected void initialize(Class type, Object oldInstance, Object newInstance, } - public static class ListDelegate extends DefaultPersistenceDelegate { - @Override - protected Expression instantiate(Object oldInstance, Encoder out) { - List oldList = (List) oldInstance; - ArrayList newList = new ArrayList(oldList); - return new Expression(newList, ArrayList.class, "new", new Object[] {}); - } - - @Override - protected boolean mutatesTo(Object oldInstance, Object newInstance) { - return false; - } - - @Override - protected void initialize(Class type, Object oldInstance, Object newInstance, Encoder out) { - java.util.Collection oldO = (java.util.Collection) oldInstance; - java.util.Collection newO = (java.util.Collection) newInstance; - - if (newO.size() != 0) { - out.writeStatement(new Statement(oldInstance, "clear", new Object[] {})); - } - for (Iterator i = oldO.iterator(); i.hasNext();) { - out.writeStatement(new Statement(oldInstance, "add", new Object[] {i.next()})); - } - } - - } - /** * DatePersistenceDelegate. Needed to serialize java.util.Date * since it is not serialization friendly. @@ -1040,8 +985,6 @@ public void exceptionThrown(Exception e) { e.setPersistenceDelegate(java.sql.Date.class, new DatePersistenceDelegate()); e.setPersistenceDelegate(Timestamp.class, new TimestampPersistenceDelegate()); - e.setPersistenceDelegate(org.datanucleus.store.types.backed.Map.class, new MapDelegate()); - e.setPersistenceDelegate(org.datanucleus.store.types.backed.List.class, new ListDelegate()); e.setPersistenceDelegate(CommonToken.class, new CommonTokenDelegate()); e.setPersistenceDelegate(Path.class, new PathDelegate());