diff --git pom.xml pom.xml
index d95f60252bf3c2bb9784b988baa3bc5d63903a9a..670278ca56eeba7b068e3c4126df2f1ffeed8c3d 100644
--- pom.xml
+++ pom.xml
@@ -151,7 +151,7 @@
1.0.1
1.7.5
4.0.4
- 0.5.0
+ 0.6.0-SNAPSHOT
2.2.0
1.1
0.2
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/AppMasterEventOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/AppMasterEventOperator.java
index 7315be5ef423349cd2f26af06be90c0c3439983d..99bc6a7d6c81e716921e8bbffea28899ec17cd7a 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/AppMasterEventOperator.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/AppMasterEventOperator.java
@@ -60,9 +60,6 @@ public void initializeOp(Configuration hconf) throws HiveException {
private void initDataBuffer(boolean skipPruning) throws HiveException {
buffer = new DataOutputBuffer();
try {
- // where does this go to?
- buffer.writeUTF(((TezContext) TezContext.get()).getTezProcessorContext().getTaskVertexName());
-
// add any other header info
getConf().writeEventHeader(buffer);
diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DynamicPartitionPruner.java ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DynamicPartitionPruner.java
index 78d6cf508dfd838c890ff46f14fa993365c0b700..9227b7a6f760f7c29220f2a0c316b75f11a68025 100644
--- ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DynamicPartitionPruner.java
+++ ql/src/java/org/apache/hadoop/hive/ql/exec/tez/DynamicPartitionPruner.java
@@ -31,6 +31,7 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -59,6 +60,7 @@
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.tez.dag.api.event.VertexState;
import org.apache.tez.runtime.api.InputInitializerContext;
import org.apache.tez.runtime.api.events.InputInitializerEvent;
@@ -77,12 +79,13 @@
private final BytesWritable writable = new BytesWritable();
- private final BlockingQueue queue =
- new LinkedBlockingQueue();
+ private final BlockingQueue