Merge pull request #493 from wenshao/master

bug fixed for classloader & support odps
support text [CHARACTER SET charset_name] [COLLATE collation_name]
result filter && tenant support
improve sql wall
merge
merge pull request
:Merge remote-tracking branch 'upstream/master' into cutedemons-master