hive+giraph workflow modified
merge confict resolved