Skip to content

Shark 141 #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
haitaoyao wants to merge 7 commits into from
Closed

Shark 141 #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3bac644
add .ensime
haitaoyao Jan 22, 2013
4b9e249
Merge branch 'amplab'
haitaoyao Jan 28, 2013
492ddf5
Merge branch 'amplab'
haitaoyao Feb 5, 2013
344c0c7
Merge branch 'amplab'
haitaoyao Feb 16, 2013
e64f734
Merge branch 'amplab'
haitaoyao May 7, 2013
c7ec602
merge amplab
haitaoyao May 20, 2013
065c752
no lock on Xml decode because of hive bug fix for HashMap
haitaoyao May 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ paper.aux
# Test Reports
TEST*.xml
test_warehouses
<<<<<<< HEAD
=======

# Ensime files for emacs
>>>>>>> amplab
.ensime
.ensime_lucene
13 changes: 5 additions & 8 deletions src/main/scala/shark/execution/serialization/XmlSerializer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
}
}