* fix bugs in logging with BIG DATASETS
Merge commit 'a13c1aafabfcc10321d259b3467c974deb8c4d94' into ctrp