Przeglądaj źródła

HUE-8390 [hive] Use database instead of schema for argument names

More consistent with the convention and less confusing.
Romain 5 lat temu
rodzic
commit
6d07836395

+ 6 - 6
apps/beeswax/src/beeswax/server/dbms.py

@@ -1157,24 +1157,24 @@ class HiveServer2Dbms(object):
     return self.client.explain(query)
 
 
-  def get_primary_keys(self, schema_name, table_name, catalog_name=None):
+  def get_primary_keys(self, database_name, table_name, catalog_name=None):
 
     return self.client.get_primary_keys(
-      schema_name=schema_name,
+      database_name=database_name,
       table_name=table_name,
       catalog_name=catalog_name
     )
 
 
-  def get_foreign_keys(self, parent_catalog_name=None, parent_schema_name=None, parent_table_name=None, foreign_catalog_name=None,
-      foreign_schema_name=None, foreign_table_name=None):
+  def get_foreign_keys(self, parent_catalog_name=None, parent_database_name=None, parent_table_name=None, foreign_catalog_name=None,
+      foreign_database_name=None, foreign_table_name=None):
 
     return self.client.get_foreign_keys(
       parent_catalog_name=parent_catalog_name,
-      parent_schema_name=parent_schema_name,
+      parent_database_name=parent_database_name,
       parent_table_name=parent_table_name,
       foreign_catalog_name=foreign_catalog_name,
-      foreign_schema_name=foreign_schema_name,
+      foreign_database_name=foreign_database_name,
       foreign_table_name=foreign_table_name
     )
 

+ 9 - 9
apps/beeswax/src/beeswax/server/hive_server2_lib.py

@@ -1203,7 +1203,7 @@ class HiveServerClient(object):
     return self.execute_async_statement(thrift_function=thrift_function, thrift_request=req)
 
 
-  def get_primary_keys(self, schema_name, table_name, catalog_name=None):
+  def get_primary_keys(self, database_name, table_name, catalog_name=None):
     '''
     Get the Primary Keys of a Table entity (seems like database name is required).
 
@@ -1219,7 +1219,7 @@ class HiveServerClient(object):
     '''
     req = TGetPrimaryKeysReq(
       catalogName=catalog_name,
-      schemaName=schema_name,
+      schemaName=database_name,
       tableName=table_name
     )
 
@@ -1237,14 +1237,14 @@ class HiveServerClient(object):
     return results
 
 
-  def get_foreign_keys(self, parent_catalog_name=None, parent_schema_name=None, parent_table_name=None, foreign_catalog_name=None,
-      foreign_schema_name=None, foreign_table_name=None):
+  def get_foreign_keys(self, parent_catalog_name=None, parent_database_name=None, parent_table_name=None, foreign_catalog_name=None,
+      foreign_database_name=None, foreign_table_name=None):
     '''
-    Get the Foreign Keys between two entities (e.g. Schemas, DB, Tables).
+    Get the Foreign Keys between two entities (e.g. Catalog, DB, Tables).
 
     e.g. Foreign Keys between the two tables people.customers and sales.orders:
-      parent_schema_name='people', parent_table_name='customers'
-      foreign_schema_name='sales', foreign_table_name='orders'
+      parent_database_name='people', parent_table_name='customers'
+      foreign_database_name='sales', foreign_table_name='orders'
 
     Table names are also optional.
 
@@ -1262,10 +1262,10 @@ class HiveServerClient(object):
     '''
     req = TGetCrossReferenceReq(
       parentCatalogName=parent_catalog_name,
-      parentSchemaName=parent_schema_name,
+      parentSchemaName=parent_database_name,
       parentTableName=parent_table_name,
       foreignCatalogName=foreign_catalog_name,
-      foreignSchemaName=foreign_schema_name,
+      foreignSchemaName=foreign_database_name,
       foreignTableName=foreign_table_name
     )