From 3bac644235b829242fced4c0a265313b4e663b72 Mon Sep 17 00:00:00 2001 From: "haitao.yao" Date: Tue, 22 Jan 2013 10:08:16 +0800 Subject: [PATCH 1/2] add .ensime --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ee5a5c50..097f6171 100755 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ paper.aux # Test Reports TEST*.xml test_warehouses +.ensime +.ensime_lucene From 065c752037aff7e59b6e8e322fdfa15acdf0a5fb Mon Sep 17 00:00:00 2001 From: "haitao.yao" Date: Thu, 23 May 2013 16:59:00 +0800 Subject: [PATCH 2/2] no lock on Xml decode because of hive bug fix for HashMap --- .../execution/serialization/XmlSerializer.scala | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/main/scala/shark/execution/serialization/XmlSerializer.scala b/src/main/scala/shark/execution/serialization/XmlSerializer.scala index 052366b2..946c574d 100644 --- a/src/main/scala/shark/execution/serialization/XmlSerializer.scala +++ b/src/main/scala/shark/execution/serialization/XmlSerializer.scala @@ -69,14 +69,11 @@ object XmlSerializer { new ByteArrayInputStream(bytes.slice(1, bytes.size)) } - // Occasionally an object inspector is created from the decoding. - // Need to put a lock on the process. - val ret = SharkEnvSlave.objectInspectorLock.synchronized { - val d: XMLDecoder = new XMLDecoder(decodedStream, null, null, cl) - val ret = d.readObject() - d.close() - ret - } + // + // no lock needed because of the hive bug fix for concurrent + val d: XMLDecoder = new XMLDecoder(decodedStream, null, null, cl) + val ret = d.readObject() + d.close() ret.asInstanceOf[T] } }