HIVE-8406: more debug code