Merge branch 'master' of http://git.wanmeizhensuo.com/ML/ffm-baseline

tensnsorflow/test.py

@@ -24,7 +24,7 @@ def con_sql(db,sql):
     return df
 
 
-# def test():
+def test():
         conf = SparkConf().setAppName("My App").set("spark.io.compression.codec", "lzf")
         sc = SparkContext(conf = conf)
         hive_context = HiveContext(sc)
@@ -62,4 +62,5 @@ def con_sql(db,sql):
 
 
 if __name__ == '__main__':
+    test()