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

tensnsorflow/test.py

@@ -2,8 +2,8 @@
 from pyspark.sql import HiveContext
 from pyspark.context import SparkContext
 from pyspark.conf import SparkConf
-import pytispark.pytispark as pti
-from pyspark.sql import SQLContext
+# import pytispark.pytispark as pti
+# from pyspark.sql import SQLContext
 from pyspark.sql import SparkSession
 # from py4j.java_gateway import java_import
 # import pytispark.pytispark as pti
@@ -28,10 +28,10 @@ def test():
         sc = SparkContext(conf = conf)
         hive_context = HiveContext(sc)
         spark = SparkSession.builder.enableHiveSupport().getOrCreate()
-        ti = pti.TiContext(spark)
-        ti.tidbMapDatabase("jerry_test")
+        # ti = pti.TiContext(spark)
+        # ti.tidbMapDatabase("jerry_test")
 
-        spark = SparkSession.builder.appName("BinarizerExample").enableHiveSupport().getOrCreate()
+        spark = SparkSession.builder.appName("hello test").enableHiveSupport().getOrCreate()
 
         spark.sql("use online")
         spark.sql("ADD JAR hdfs:///user/hive/share/lib/udf/brickhouse-0.7.1-SNAPSHOT.jar")