Merge pull request FederatedAI#3029 from FederatedAI/develop-1.6.1-do…

…c_update

fix

python/fate_arch/storage/linkis_hive/_table.py

@@ -117,15 +117,12 @@ def count(self, **kwargs):
         return count
 
     def collect(self, **kwargs):
-        from fate_arch.common.log import schedule_logger
         if kwargs.get("is_spark"):
             from pyspark.sql import SparkSession
             session = SparkSession.builder.enableHiveSupport().getOrCreate()
             data = session.sql(f"select * from {self._address.database}.{self._address.name}")
-            schedule_logger('wzh_test').info(data)
             return data
         else:
-            schedule_logger('wzh_test').info(f"no spark")
             sql = 'select * from {}.{}'.format(self._address.database, self._address.name)
             data = self.execute(sql)
             for i in data:

python/fate_arch/storage/mysql/_table.py

@@ -75,7 +75,7 @@ def get_options(self):
         return self._options
 
     def count(self, **kwargs):
-        sql = 'select count(*) from {}'.format(self._name)
+        sql = 'select count(*) from {}'.format(self._address._name)
         try:
             self.cur.execute(sql)
             self.con.commit()

python/requirements.txt

@@ -43,3 +43,13 @@ llvmlite==0.33.0
 phe>=1.4.0
 protobuf>=3.6.1
 pyarrow==0.17.1
+
+# addtional requirements for fate-client
+click>=7.1.2,<8.0.0
+loguru>=0.5.1,<0.6.0
+ruamel.yaml>=0.16.10,<0.17.0
+torch==1.4.0
+prettytable>=1.0.0,<2.0.0
+setuptools>=50.0,<51.0
+sshtunnel>=0.1.5,<0.2.0
+colorama>=0.4.4