Browse Source

HUE-1118 [catalog] Add breadcrums to table browser

Added breadcrumbs that for tables, table description, and partitions.
Abraham Elmahrek 12 năm trước cách đây
mục cha
commit
0f5d66bf33

+ 16 - 227
apps/beeswax/static/help/index.html

@@ -1,6 +1,6 @@
 <h1><a name="Beeswax-IntroducingBeeswax"></a>Introducing Beeswax</h1>
 
-<p>The Beeswax application enables you to perform queries on Apache Hive, a data warehousing system designed to work with Hadoop. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create Hive tables, load data, create, run, and manage queries, and download the results in a Microsoft Office Excel worksheet file or a comma-separated values file.</p>
+<p>The Beeswax application enables you to perform queries on Apache Hive, a data warehousing system designed to work with Hadoop. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create, run, and manage queries, and download the results in a Microsoft Office Excel worksheet file or a comma-separated values file.</p>
 
 
 <h2><a name="Beeswax-Contents"></a>Contents</h2>
@@ -16,10 +16,6 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
     <li><a href='#Beeswax-BeeswaxandHiveInstallationandConfiguration'>Beeswax and Hive Installation and Configuration</a></li>
     <li><a href='#Beeswax-StartingBeeswax'>Starting Beeswax</a></li>
 <ul>
-<ul>
-    <li><a href='#Beeswax-InstallingtheSampleTables'>Installing the Sample Tables</a></li>
-    <li><a href='#Beeswax-ImportingYourOwnData'>Importing Your Own Data</a></li>
-</ul>
 </ul>
     <li><a href='#Beeswax-WorkingwithQueries'>Working with Queries</a></li>
 <ul>
@@ -29,17 +25,6 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
     <li><a href='#Beeswax-ViewingQueryHistory'>Viewing Query History</a></li>
     <li><a href='#Beeswax-Viewing%2CEditing%2CorDeletingSavedQueries'>Viewing, Editing, or Deleting Saved Queries</a></li>
 </ul>
-</ul>
-    <li><a href='#Beeswax-WorkingwithTables'>Working with Tables</a></li>
-<ul>
-<ul>
-    <li><a href='#Beeswax-SelectingtheDatabase'>Selecting the Database</a></li>
-    <li><a href='#Beeswax-CreatingTables'>Creating Tables</a></li>
-    <li><a href='#Beeswax-BrowsingTables'>Browsing Tables</a></li>
-    <li><a href='#Beeswax-ImportingDataintoTables'>Importing Data into Tables</a></li>
-    <li><a href='#Beeswax-DroppingTables'>Dropping Tables</a></li>
-    <li><a href='#Beeswax-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
-</ul>
 </ul>
 </ul></div>
 <p><br class="atl-forced-newline" /></p>
@@ -57,22 +42,6 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
 
 <p>To start the Beeswax application, click the <b>Beeswax</b> icon (<span class="image-wrap" style=""><img src="/beeswax/static/help/images/23888161.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
 
-<h3><a name="Beeswax-InstallingtheSampleTables"></a>Installing the Sample Tables</h3>
-
-<p>You can install two sample tables to use as examples.</p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
-	<li>In the ACTIONS pane, click <b>Install samples</b>.</li>
-</ol>
-
-
-<p>Once you have installed the sample data, you will no longer see the <b>Install samples</b> link.</p>
-
-<h3><a name="Beeswax-ImportingYourOwnData"></a>Importing Your Own Data</h3>
-
-<p>If you want to import your own data instead of installing the sample tables, following the procedure in <a href="#Beeswax-CreatingTables">Creating Tables</a>.</p>
-
 <h1><a name="Beeswax-WorkingwithQueries"></a>Working with Queries</h1>
 
 <p>The Query Editor view lets you create queries in the <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual">Hive Query Language (HQL)</a>, which is similar to Structured Query Language (SQL). You can name and save your queries to use later. When you submit a query, the Beeswax Server uses Hive to run the queries. You can either wait for the query to complete, or return later to find the queries in the History view. You can also request receive an email message after the query is completed.</p>
@@ -142,21 +111,21 @@ The Query Results window displays with the results of the query.
 <p>The pane to the left of the Query Editor lets you specify the following options:
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" /></p>
-
-<style type="text/css">
-td.confluenceTd {
-border: #dddddd solid 1px;
-height: 36px;
-padding: 5px 10px;
-vertical-align: top;
-}
-th.confluenceTh {
-border: #dddddd solid 1px;
-height: 40px;
-padding: 5px 10px;
-vertical-align: center;
-}
-</style>
+
+<style type="text/css">
+td.confluenceTd {
+border: #dddddd solid 1px;
+height: 36px;
+padding: 5px 10px;
+vertical-align: top;
+}
+th.confluenceTh {
+border: #dddddd solid 1px;
+height: 40px;
+padding: 5px 10px;
+vertical-align: center;
+}
+</style>
 
 
 <div class='table-wrap'>
@@ -318,186 +287,6 @@ A copy of the query displays in the Query Editor window.
 </ol>
 
 
-<h1><a name="Beeswax-WorkingwithTables"></a>Working with Tables</h1>
-
-<p>When working with Hive tables, you can use Beeswax to:</p>
-<ul>
-	<li><a href="#Beeswax-SelectingtheDatabase">Select a database</a></li>
-	<li><a href="#Beeswax-CreatingTables">Create tables</a></li>
-	<li><a href="#Beeswax-BrowsingTables">Browse tables</a></li>
-	<li><a href="#Beeswax-ImportingDataintoTables">Import data into tables</a></li>
-	<li>Drop tables (see <a href="#Beeswax-DroppingTables">Dropping Tables</a></li>
-	<li><a href="#Beeswax-ViewingaTable%27sLocation">View the location of a table</a></li>
-</ul>
-
-
-<p><a name="Beeswax-SelectingtheDatabase"></a></p>
-<h3><a name="Beeswax-SelectingtheDatabase"></a>Selecting the Database</h3>
-
-<ol>
-	<li>In the pane on the left, select the database from the DATABASE drop-down list.</li>
-</ol>
-
-
-<p><a name="Beeswax-CreatingTables"></a></p>
-
-<h3><a name="Beeswax-CreatingTables"></a>Creating Tables</h3>
-
-<p>Although you can create tables by executing the appropriate HQL DDL query commands, it is easier to create a table using the Beeswax table creation wizard.</p>
-
-<p>There are two ways to create a table: from a file or manually.</p>
-
-<p>If you create a table from a file, the format of the data in the file will determine some of the properties of the table, such as the record and file formats. The data from the file you specify is imported automatically upon table creation.</p>
-
-<p>When you create a file manually, you specify all the properties of the table, and then execute the resulting query to actually create the table.  You then import data into the table as an additional step.</p>
-
-
-<p><b>To create a table from a file</b>:</p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
-	<li>In the ACTIONS pane, click <b>Create a new table from a file</b>.<br/>
-The table creation wizard starts.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Follow the instructions in the wizard to create the table. The basic steps are:
-	<ul>
-		<li>Choose your input file.  The input file you specify must exist.<br/>
-Note that you can choose to have Beeswax create the table definition only based on the import file you select, without actually importing data from that file.</li>
-		<li>Specify the column delimiter.</li>
-		<li>Define your columns, providing a name and selecting the type.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	</ul>
-	</li>
-	<li>Click <b>Create Table</b> to create the table.<br/>
-The new table's metadata displays on the right side of the <b>Table Metadata</b> window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-At this point, you can view the metadata or a sample of the data in the table.<br/>
-From the ACTIONS pane you can import new data into the table, browse the table, drop it, or go to the File Browser to see the location of the data.</li>
-</ol>
-
-
-
-<p><b>To create a table manually:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
-	<li>In the ACTIONS pane, click <b>Create a new table manually</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The table creation wizard starts.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Follow the instructions in the wizard to create the table. The basic steps are:
-	<ul>
-		<li>Name your table.</li>
-		<li>Choose the record format.</li>
-		<li>Configure record serialization by specifying delimiters for columns, collections, and map keys.</li>
-		<li>Choose the file format.</li>
-		<li>Specify the location for your table's data.</li>
-		<li>Define your columns, providing a name and selecting the type.</li>
-		<li>Add partitions, if appropriate.</li>
-	</ul>
-	</li>
-	<li>Click <b>Create table</b>.<br/>
-The Table Metadata window displays.</li>
-</ol>
-
-
-<p><a name="Beeswax-BrowsingTables"></a></p>
-
-<h3><a name="Beeswax-BrowsingTables"></a>Browsing Tables</h3>
-
-<p><b>To browse the data in a table:</b></p>
-
-<ol>
-	<li>In the Table List window, click the <b>Browse Data</b> button next to the table you want to browse.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The table's data displays in the Query Results window.</li>
-</ol>
-
-
-<p><b>To browse the metadata in a table:</b></p>
-
-<ol>
-	<li>In the Table List window, click the table name.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The table's metadata displays opened to the <b>Columns</b> tab. You can view the data in the table by selecting the <b>Sample</b> tab.</li>
-</ol>
-
-
-<p><a name="Beeswax-ImportingDataintoTables"></a></p>
-
-<h3><a name="Beeswax-ImportingDataintoTables"></a>Importing Data into Tables</h3>
-
-<p>When importing data, you can choose to append or overwrite the table's data with data from a file.</p>
-
-<p><b>To import data into a table:</b></p>
-
-<ol>
-	<li>In the Table List window, click the table name.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Table Metadata window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the ACTIONS pane, click <b>Import Data</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>For <b>Path</b>, enter the path to the file that contains the data you want to import.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Check <b>Overwrite existing data</b> to replace the data in the selected table with the imported data.  Leave this unchecked to append to the table.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click <b>Submit</b>.</li>
-</ol>
-
-
-<p><a name="Beeswax-DroppingTables"></a></p>
-
-<h3><a name="Beeswax-DroppingTables"></a>Dropping Tables</h3>
-
-<p><b>To drop a table:</b></p>
-
-<ol>
-	<li>In the Table List window, click the table name.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Table Metadata window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>In the ACTIONS pane, click <b>Drop Table</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click <b>Yes</b> to confirm the deletion.</li>
-</ol>
-
-
-<p><a name="Beeswax-ViewingaTable%27sLocation"></a></p>
-
-<h3><a name="Beeswax-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
-
-<p><b>To view a table's location:</b></p>
-
-<ol>
-	<li>In the Table List window, click the table name.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Table Metadata window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click <b>View File Location</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The file location of the selected table displays in its directory in the File Browser window. </li>
-</ol>
-
-
 				    					    <br/>
                         </td>
 		    </tr>

+ 16 - 90
apps/catalog/src/catalog/templates/components.mako

@@ -18,70 +18,28 @@
   from django.utils.translation import ugettext as _
 %>
 
-<%def name="fieldName(field)">
+<%def name="breadcrumbs(breadcrumbs)">
+<ul class="nav nav-pills hueBreadcrumbBar" id="breadcrumbs">
+  <li><a href="${url('catalog:index')}"><i class="icon-home"></i> ${_('Home')}</a></li>
+  <li>
+    <ul class="hueBreadcrumb">
+      % for crumb in breadcrumbs:
+        <li>
+          <a href="${ crumb['url'] }">${ crumb['name'] }</a>
+          % if not loop.last:
+            <span class="divider">/</span>
+          % endif
+        </li>
+      % endfor
+    </ul>
+  </li>
+</ul>
 </%def>
 
 <%def name="bootstrapLabel(field)">
     <label for="${field.html_name | n}" class="control-label">${field.label}</label>
 </%def>
 
-<%def name="label(
-  field,
-  render_default=False,
-  data_filters=None,
-  hidden=False,
-  notitle=False,
-  tag='input',
-  klass=None,
-  attrs=None,
-  value=None,
-  help=False,
-  help_attrs=None,
-  dd_attrs=None,
-  dt_attrs=None,
-  title_klass=None,
-  button_text=False
-  )">
-<%
-  if value is None:
-    value = extract_field_data(field)
-
-  def make_attr_str(attributes):
-    if attributes is None:
-      attributes = {}
-    ret_str = ""
-    for key, value in attributes.iteritems():
-      if key == "klass":
-        key = "class"
-      ret_str += "%s='%s'" % (key.replace("_", "-"), unicode(value))
-    return ret_str
-
-  if not attrs:
-    attrs = {}
-  if not render_default:
-    attrs.setdefault('type', 'text')
-
-  if data_filters:
-    attrs.data_filters = data_filters
-
-  classes = []
-  if klass:
-    classes.append(klass)
-  if hidden:
-    classes.append("hide")
-  cls = ' '.join(classes)
-
-  title_classes = []
-  if title_klass:
-    title_classes.append(title_klass)
-  if notitle or hidden:
-    title_classes.append("hide")
-  titlecls = ' '.join(title_classes)
-%>
-${field.label_tag() | n}
-</%def>
-
-
 <%def name="field(
   field,
   render_default=False,
@@ -171,35 +129,3 @@ ${field.label_tag() | n}
         % endif
     % endif
 </%def>
-
-
-<%def name="pageref(num)">
-  % if hasattr(filter_params, "urlencode"):
-    href="?q-page=${num}&${filter_params.urlencode()}"
-  % else:
-    href="?q-page=${num}&${filter_params}"
-  % endif
-</%def>
-<%def name="prevpage(page)">
-  ${pageref(page.previous_page_number())}
-</%def>
-<%def name="nextpage(page)">
-  ${pageref(page.next_page_number())}
-</%def>
-<%def name="toppage(page)">
-  ${pageref(1)}
-</%def>
-<%def name="bottompage(page)">
-  ${pageref(page.num_pages())}
-</%def>
-<%def name="pagination(page)">
-    <div class="pagination">
-        <ul class="pull-right">
-            <li class="prev"><a title="${_('Beginning of List')}" ${toppage(page)}>&larr; ${_('Beginning of List')}</a></li>
-            <li><a title="${_('Previous Page')}" ${prevpage(page)}>${_('Previous Page')}</a></li>
-            <li><a title="${_('Next page')}" ${nextpage(page)}>${_('Next Page')}</a></li>
-            <li class="next"><a title="${_('End of List')}" ${bottompage(page)}>${_('End of List')} &rarr;</a></li>
-        </ul>
-        <p>${_('Showing %(start)s to %(end)s of %(count)s items, page %(page)s of %(pages)s') % dict(start=page.start_index(),end=page.end_index(),count=page.total_count(),page=page.number,pages=page.num_pages())}</p>
-    </div>
-</%def>

+ 5 - 0
apps/catalog/src/catalog/templates/describe_partitions.mako

@@ -19,7 +19,10 @@
   from django.utils.translation import ugettext as _
 %>
 
+<%namespace name="components" file="components.mako" />
+
 ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name), app_name, user) | n,unicode }
+${ components.breadcrumbs(breadcrumbs) }
 
 <div class="container-fluid">
 <h1>${_('Partitions')}</h1>
@@ -54,4 +57,6 @@ ${ commonheader(_('Table Partitions: %(tableName)s') % dict(tableName=table.name
 
 </div>
 
+<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+
 ${ commonfooter(messages) | n,unicode }

+ 4 - 1
apps/catalog/src/catalog/templates/describe_table.mako

@@ -18,7 +18,7 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 
-<%namespace name="comps" file="components.mako" />
+<%namespace name="components" file="components.mako" />
 
 <%
   if table.is_view:
@@ -27,6 +27,7 @@ from django.utils.translation import ugettext as _
     view_or_table_noun = _("Table")
 %>
 ${ commonheader(_("%s Metadata: %s") % (view_or_table_noun, table.name), app_name, user) | n,unicode }
+${ components.breadcrumbs(breadcrumbs) }
 
 <%def name="column_table(cols)">
     <table class="table table-striped table-condensed datatables">
@@ -161,6 +162,8 @@ ${ commonheader(_("%s Metadata: %s") % (view_or_table_noun, table.name), app_nam
    }
 </style>
 
+<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+
 <script type="text/javascript" charset="utf-8">
    $(document).ready(function () {
      $(".datatables").dataTable({

+ 5 - 1
apps/catalog/src/catalog/templates/tables.mako

@@ -18,11 +18,13 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 <%namespace name="actionbar" file="actionbar.mako" />
+<%namespace name="components" file="components.mako" />
 <%namespace name="layout" file="layout.mako" />
 
 ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
+${ components.breadcrumbs(breadcrumbs) }
 
-<div class="container-fluid">
+<div class="container-fluid" id="tables">
     <h1>${_('Tables')}</h1>
     <div class="row-fluid">
         <div class="span3">
@@ -115,6 +117,8 @@ ${ commonheader(_('Tables'), 'catalog', user) | n,unicode }
   </form>
 </div>
 
+<link rel="stylesheet" href="/catalog/static/css/catalog.css" type="text/css">
+
 <script src="/static/ext/js/jquery/plugins/jquery.cookie.js"></script>
 <script src="/static/ext/js/knockout-2.1.0.js" type="text/javascript" charset="utf-8"></script>
 

+ 10 - 3
apps/catalog/src/catalog/tests.py

@@ -55,6 +55,7 @@ def _make_query(client, query, submission_type="Execute",
 
   return res
 
+
 class TestCatalogWithHadoop(BeeswaxSampleProvider):
   requires_hadoop = True
 
@@ -63,9 +64,6 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     self.db = dbms.get(user, get_query_server_config())
 
   def test_basic_flow(self):
-    """
-    Test basic query submission
-    """
     # Table should have been created
     response = self.client.get("/catalog/tables/")
     assert_true("test" in response.context["tables"])
@@ -104,11 +102,20 @@ class TestCatalogWithHadoop(BeeswaxSampleProvider):
     assert_true(resp.context['table'].is_view)
     assert_true("View Metadata" in resp.content)
     assert_true("Drop View" in resp.content)
+    # Breadcrumbs
+    assert_true("default" in resp.content)
+    assert_true("myview" in resp.content)
 
   def test_describe_partitions(self):
     response = self.client.get("/catalog/table/default/test_partitions/partitions", follow=True)
     assert_true("baz_one" in response.content)
     assert_true("boom_two" in response.content)
+    # Breadcrumbs
+    assert_true("default" in response.content)
+    assert_true("test_partitions" in response.content)
+    assert_true("partitions" in response.content)
+
+    # Not partitioned
     response = self.client.get("/catalog/table/default/test/partitions", follow=True)
     assert_true("is not partitioned." in response.content)
 

+ 40 - 10
apps/catalog/src/catalog/views.py

@@ -64,11 +64,17 @@ def show_tables(request, database=None):
   examples_installed = MetaInstall.get().installed_example
 
   return render("tables.mako", request, {
-      'tables': tables,
-      'examples_installed': examples_installed,
-      'db_form': db_form,
-      'database': database,
-      'tables_json': json.dumps(tables),
+    'breadcrumbs': [
+      {
+        'name': database,
+        'url': reverse('catalog:show_tables', kwargs={'database': database})
+      }
+    ],
+    'tables': tables,
+    'examples_installed': examples_installed,
+    'db_form': db_form,
+    'database': database,
+    'tables_json': json.dumps(tables),
   })
 
 
@@ -85,10 +91,20 @@ def describe_table(request, database, table):
     error_message, logs = dbms.expand_exception(ex, db)
 
   return render("describe_table.mako", request, {
-      'table': table,
-      'sample': table_data and table_data.rows(),
-      'error_message': error_message,
-      'database': database,
+    'breadcrumbs': [
+      {
+        'name': database,
+        'url': reverse('catalog:show_tables', kwargs={'database': database})
+      },
+      {
+        'name': str(table.name),
+        'url': reverse('catalog:describe_table', kwargs={'database': database, 'table': table.name})
+      },
+    ],
+    'table': table,
+    'sample': table_data and table_data.rows(),
+    'error_message': error_message,
+    'database': database,
   })
 
 
@@ -170,4 +186,18 @@ def describe_partitions(request, database, table):
   partitions = db.get_partitions(database, table_obj, max_parts=None)
 
   return render("describe_partitions.mako", request,
-                dict(table=table_obj, partitions=partitions, request=request))
+                dict(breadcrumbs=[
+                  {
+                    'name': database,
+                    'url': reverse('catalog:show_tables', kwargs={'database': database})
+                  },
+                  {
+                    'name': table,
+                    'url': reverse('catalog:describe_table', kwargs={'database': database, 'table': table})
+                  },
+                  {
+                    'name': 'partitions',
+                    'url': reverse('catalog:describe_partitions', kwargs={'database': database, 'table': table})
+                  },
+                ],
+                table=table_obj, partitions=partitions, request=request))

+ 3 - 0
apps/catalog/static/css/catalog.css

@@ -0,0 +1,3 @@
+.hueBreadcrumb {
+  padding: 7px 14px;
+}

BIN
apps/catalog/static/help/images/23888161.png


+ 38 - 315
apps/catalog/static/help/index.html

@@ -1,9 +1,9 @@
-<h1><a name="Beeswax-IntroducingBeeswax"></a>Introducing Beeswax</h1>
+<h1><a name="Catalog-IntroducingCatalog"></a>Introducing Table Browser</h1>
 
-<p>The Beeswax application enables you to perform queries on Apache Hive, a data warehousing system designed to work with Hadoop. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create Hive tables, load data, create, run, and manage queries, and download the results in a Microsoft Office Excel worksheet file or a comma-separated values file.</p>
+<p>The Table Browser application enables you to browse tables and partitions of a Hive database. For information about Hive, see <a href="http://archive.cloudera.com/cdh4/cdh/4/hive/">Hive Documentation</a>. You can create Hive tables, view Hive tables, and load data into Hive tables.</p>
 
 
-<h2><a name="Beeswax-Contents"></a>Contents</h2>
+<h2><a name="Catalog-Contents"></a>Contents</h2>
 
 <style type='text/css'>/*<![CDATA[*/
 div.rbtoc1359395567394 {margin-left: 1.5em;padding: 0px;}
@@ -12,338 +12,61 @@ div.rbtoc1359395567394 li {margin-left: 0px;padding-left: 0px;}
 
 /*]]>*/</style><div class='rbtoc1359395567394'>
 <ul>
-    <li><a href='#Beeswax-IntroducingBeeswax'>Introducing Beeswax</a></li>
-    <li><a href='#Beeswax-BeeswaxandHiveInstallationandConfiguration'>Beeswax and Hive Installation and Configuration</a></li>
-    <li><a href='#Beeswax-StartingBeeswax'>Starting Beeswax</a></li>
+    <li><a href='#Catalog-IntroducingCatalog'>Introducing Table Browser</a></li>
+    <li><a href='#Catalog-CatalogandHiveInstallationandConfiguration'>Table Browser and Hive Installation and Configuration</a></li>
+    <li><a href='#Catalog-StartingCatalog'>Starting Table Browser</a></li>
 <ul>
 <ul>
-    <li><a href='#Beeswax-InstallingtheSampleTables'>Installing the Sample Tables</a></li>
-    <li><a href='#Beeswax-ImportingYourOwnData'>Importing Your Own Data</a></li>
+    <li><a href='#Catalog-InstallingtheSampleTables'>Installing the Sample Tables</a></li>
+    <li><a href='#Catalog-ImportingYourOwnData'>Importing Your Own Data</a></li>
 </ul>
 </ul>
-    <li><a href='#Beeswax-WorkingwithQueries'>Working with Queries</a></li>
+    <li><a href='#Catalog-WorkingwithTables'>Working with Tables</a></li>
 <ul>
 <ul>
-    <li><a href='#Beeswax-CreatingandRunningQueries'>Creating and Running Queries</a></li>
-    <li><a href='#Beeswax-AdvancedQuerySettings'>Advanced Query Settings</a></li>
-    <li><a href='#Beeswax-ViewingQueryHistory'>Viewing Query History</a></li>
-    <li><a href='#Beeswax-Viewing%2CEditing%2CorDeletingSavedQueries'>Viewing, Editing, or Deleting Saved Queries</a></li>
-</ul>
-</ul>
-    <li><a href='#Beeswax-WorkingwithTables'>Working with Tables</a></li>
-<ul>
-<ul>
-    <li><a href='#Beeswax-SelectingtheDatabase'>Selecting the Database</a></li>
-    <li><a href='#Beeswax-CreatingTables'>Creating Tables</a></li>
-    <li><a href='#Beeswax-BrowsingTables'>Browsing Tables</a></li>
-    <li><a href='#Beeswax-ImportingDataintoTables'>Importing Data into Tables</a></li>
-    <li><a href='#Beeswax-DroppingTables'>Dropping Tables</a></li>
-    <li><a href='#Beeswax-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
+    <li><a href='#Catalog-SelectingtheDatabase'>Selecting the Database</a></li>
+    <li><a href='#Catalog-CreatingTables'>Creating Tables</a></li>
+    <li><a href='#Catalog-BrowsingTables'>Browsing Tables</a></li>
+    <li><a href='#Catalog-ImportingDataintoTables'>Importing Data into Tables</a></li>
+    <li><a href='#Catalog-DroppingTables'>Dropping Tables</a></li>
+    <li><a href='#Catalog-ViewingaTable%27sLocation'>Viewing a Table's Location</a></li>
 </ul>
 </ul>
 </ul></div>
 <p><br class="atl-forced-newline" /></p>
 
-<h1><a name="Beeswax-BeeswaxandHiveInstallationandConfiguration"></a>Beeswax and Hive Installation and Configuration</h1>
+<h1><a name="Catalog-CatalogandHiveInstallationandConfiguration"></a>Table Browser and Hive Installation and Configuration</h1>
 
-<p>Beeswax is installed and configured as part of Hue. For information about installing and configuring Hue, see <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>.</p>
+<p>Table Browser is installed and configured as part of Hue. For information about installing and configuring Hue, see <a href="https://ccp.cloudera.com/display/CDH4DOC/Hue+Installation">Hue Installation</a>.</p>
 
-<p>Beeswax assumes an existing Hive installation.  The Hue installation instructions include the configuration necessary for Beeswax to access Hive. You can view the current Hive configuration from from the <b>Settings</b> tab in the Beeswax application.</p>
+<p>Table Browser depends on the Beeswax application being installed and available.</p>
 
-<p>By default, a Beeswax user can see the saved queries for all users &#8211; both his/her own queries and those of other Beeswax users. To restrict viewing saved queries to the query owner and Hue administrators, set the <tt>share_saved_queries</tt> property under the <tt>[beeswax]</tt> section in the Hue configuration file to <tt>false</tt>. </p>
 
+<h1><a name="Catalog-StartingCatalog"></a>Starting Table Browser</h1>
 
-<h1><a name="Beeswax-StartingBeeswax"></a>Starting Beeswax</h1>
+<p>To start the Table Browser application, click the <b>Table Browser</b> icon (<span class="image-wrap" style=""><img src="/catalog/static/art/table-browser-24-1.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
 
-<p>To start the Beeswax application, click the <b>Beeswax</b> icon (<span class="image-wrap" style=""><img src="/beeswax/static/help/images/23888161.png" width="30" style="border: 0px solid black"/></span>) in the navigation bar at the top of the Hue browser page.</p>
-
-<h3><a name="Beeswax-InstallingtheSampleTables"></a>Installing the Sample Tables</h3>
+<h3><a name="Catalog-InstallingtheSampleTables"></a>Installing the Sample Tables</h3>
 
 <p>You can install two sample tables to use as examples.</p>
 
 <ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
+	<li>In the Table Browser window, click <b>Tables</b>.</li>
 	<li>In the ACTIONS pane, click <b>Install samples</b>.</li>
 </ol>
 
 
 <p>Once you have installed the sample data, you will no longer see the <b>Install samples</b> link.</p>
 
-<h3><a name="Beeswax-ImportingYourOwnData"></a>Importing Your Own Data</h3>
-
-<p>If you want to import your own data instead of installing the sample tables, following the procedure in <a href="#Beeswax-CreatingTables">Creating Tables</a>.</p>
-
-<h1><a name="Beeswax-WorkingwithQueries"></a>Working with Queries</h1>
-
-<p>The Query Editor view lets you create queries in the <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual">Hive Query Language (HQL)</a>, which is similar to Structured Query Language (SQL). You can name and save your queries to use later. When you submit a query, the Beeswax Server uses Hive to run the queries. You can either wait for the query to complete, or return later to find the queries in the History view. You can also request receive an email message after the query is completed.</p>
-
-<h3><a name="Beeswax-CreatingandRunningQueries"></a>Creating and Running Queries</h3>
-
-<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><b>Note</b><br />To run a query, you must be logged in to Hue as a user that also has a Unix user account on the remote server.</td></tr></table></div>
-
-<p><b>To create and run a query</b>:</p>
-
-<ol>
-	<li>In the Query Editor window, type the query. For example, to select all data from the <em>sample_08</em> table, you would type:
-<div class="code panel" style="border-width: 1px;"><div class="codeContent panelContent">
-<div id="root">
-		<pre class="theme: Default; brush: plain; gutter: false">SELECT * FROM sample_08</pre>
-		</div>
-</div></div></li>
-	<li>In the box to the left of the Query field, you can override the default Hive and Hadoop settings, specify file resources and user-defined functions, and enable users to enter parameters at run-time, and request email notification when the job is complete.  See <a href="#Beeswax-AdvancedSettings">Advanced Query Settings</a> for details on using these settings.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To save your query and advanced settings to use again later, click <b>Save As,</b> enter a name and description, and then click <b>OK</b>. To save changes to an existing query, click <b>Save.</b>
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>If you want to view the execution plan for the query, click <b>Explain</b>. For more information, see <a href="http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain">http://wiki.apache.org/hadoop/Hive/LanguageManual/Explain</a>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To run the query, click <b>Execute</b>.
-<br class="atl-forced-newline" />
-<a name="Beeswax-QueryResults"></a><br/>
-The Query Results window displays with the results of the query.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Do any of the following to download or save the query results:
-<br class="atl-forced-newline" />
-	<ul>
-		<li>Click <b>Download as CSV</b> to download the results in a comma-separated values file suitable for use in other applications.</li>
-		<li>Click <b>Download as XLS</b> to download the results in a Microsoft Office Excel worksheet file.</li>
-		<li>Click <b>Save</b> to save the results in a table or HDFS file.
-		<ul>
-			<li>To save the results in a new table, select <b>In a new table</b>, enter a table name, and then click <b>Save</b>.</li>
-			<li>To save the results in an HDFS file, select <b>In an HDFS directory</b>, enter a path and then click <b>Save</b>. You can then download the file with FileBrowser.
-<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><ul>
-	<li>You can only save results to a file when the results were generated by a MapReduce job.</li>
-	<li>This is the preferred way to save when the result is large (for example &gt; 1M rows).</li>
-</ul>
-</td></tr></table></div></li>
-		</ul>
-		</li>
-	</ul>
-	</li>
-</ol>
-
-
-<ul>
-	<li>Under <b>MR Jobs</b>, you can view any MapReduce jobs that the query started.</li>
-	<li>To view a log of the query execution, click <b>Log</b> at the top of the results display. You can use the information in this tab to debug your query.</li>
-	<li>To view the query that generated these results, click <b>Query</b> at the top of the results display.</li>
-	<li>To view the columns of the query, click <b>Columns</b>.</li>
-	<li>To return to the query in the Query Editor, click <b>Unsaved Query</b>.</li>
-</ul>
-
-
-<p><a name="Beeswax-AdvancedSettings"></a></p>
-
-<h3><a name="Beeswax-AdvancedQuerySettings"></a>Advanced Query Settings</h3>
-
-<p>The pane to the left of the Query Editor lets you specify the following options:
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></p>
-
-<style type="text/css">
-td.confluenceTd {
-border: #dddddd solid 1px;
-height: 36px;
-padding: 5px 10px;
-vertical-align: top;
-}
-th.confluenceTh {
-border: #dddddd solid 1px;
-height: 40px;
-padding: 5px 10px;
-vertical-align: center;
-}
-</style>
-
-
-<div class='table-wrap'>
-<table class='confluenceTable'><tbody>
-<tr>
-<th class='confluenceTh'> Option </th>
-<th class='confluenceTh'> Description </th>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>DATABASE</b> </td>
-<td class='confluenceTd'> The database containing the table definitions. </td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>SETTINGS</b> </td>
-<td class='confluenceTd'> Override the Hive and Hadoop default settings. Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />
-»&nbsp;&nbsp; For <b>Key</b>, enter a Hive or Hadoop configuration variable name. <br class="atl-forced-newline" />
-»&nbsp;&nbsp; For <b>Value</b>, enter the value you want to use for the variable. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-For example, to override the directory where structured <font color="#000000">Hive&nbsp;</font>query logs are created, you would enter <tt>hive.querylog.location</tt> for <b>Key</b>, and a path for <b>Value.</b> <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-To view the default settings, click the <b>Settings</b> tab at the top of the page. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-For information about Hive configuration variables, see: <a href="http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration">http://wiki.apache.org/hadoop/Hive/AdminManual/Configuration</a>. For information about Hadoop configuration variables, see: <a href="http://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml">http://hadoop.apache.org/docs/current/hadoop-mapreduce-client/hadoop-mapreduce-client-core/mapred-default.xml</a> </td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>FILE RESOURCES</b> </td>
-<td class='confluenceTd'> Make locally accessible files available at query execution time on the entire Hadoop cluster. Hive uses Hadoop's Distributed Cache to distribute the added files to all machines in the cluster at query execution time. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-From the <b>Type</b> drop-down menu, choose one of the following: <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<b>jar</b> &#8212; Adds the resources to the Java classpath. This is required in order to reference objects such as user defined functions. <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<b>archive</b> &#8212; Automatically unarchives resources when distributing them. <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-<b>file</b> &#8212; Adds resources to the distributed cache. Typically, this might be a transform script (or similar) to be executed. <br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-For <b>Path</b>, enter the path to the file or click <b>Choose a File</b> to browse and select the file.&nbsp; 
-<div class='panelMacro'><table class='noteMacro'><colgroup><col width='24'><col></colgroup><tr><td valign='top'><img src="/static/art/help/warning.gif" width="16" height="16" align="absmiddle" alt="" border="0"></td><td><br class="atl-forced-newline" />
-It is not necessary to specify files used in a transform script if the files are available in the same path on all machines in the Hadoop cluster.</td></tr></table></div>
-<p> </p></td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>USER-DEFINED FUNCTIONS</b> </td>
-<td class='confluenceTd'> Specify user-defined functions in a query. Specify the function name for <b>Name</b>, and specify the class name for <b>Class</b> <b>name</b>. <br class="atl-forced-newline" />
-Click <b>Add</b> to configure a new setting. <br class="atl-forced-newline" />  <br class="atl-forced-newline" />
-You must specify a JAR file for the user-defined functions in <b>File Resources</b>. To include a user-defined function in a query, add a $ (dollar sign) before the function name in the query. For example, if <em>MyTable</em> is a user-defined function name in the query, you would type: <tt>SELECT * $MyTable</tt> </td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>PARAMETERIZATION</b> </td>
-<td class='confluenceTd'> Indicate that a dialog box should display to enter parameter values when a query containing the string $&lt;parametername&gt; is executed. Enabled by default. </td>
-</tr>
-<tr>
-<td class='confluenceTd'> <b>EMAIL NOTIFICATION</b> </td>
-<td class='confluenceTd'> Indicate that an email message should be sent after a query completes. The email is sent to the email address specified in the logged-in user's profile. </td>
-</tr>
-</tbody></table>
-</div>
-
-<p><br class="atl-forced-newline" /></p>
-
-<h3><a name="Beeswax-ViewingQueryHistory"></a>Viewing Query History</h3>
-
-<p>Beeswax enables you to view the history of queries that you have previously run. Results for these queries are available for one week or until Hue is restarted.</p>
-
-
-<p><b>To view query history:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>History</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays a list of your saved and unsaved queries in the Query History window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To display the queries for all users, click <b>Show everyone's queries</b>. To display your queries only, click <b>Show my queries</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To display the automatically generated actions that Beeswax performed on a user's behalf, click <b>Show auto actions</b>. To display user queries again, click <b>Show user queries</b>.</li>
-</ol>
-
-
-<h3><a name="Beeswax-Viewing%2CEditing%2CorDeletingSavedQueries"></a>Viewing, Editing, or Deleting Saved Queries</h3>
-
-<p>You can view a list of saved queries of all users by clicking <b>Saved Queries</b> in the Beeswax window. You can copy any user's query, but you can only edit, delete, and view the history of your own queries.</p>
-
-
-<p><b>To edit a saved query:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Queries window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the <b>Options</b> button next to the query and choose <b>Edit</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The query displays in the Query Editor window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Change the query and then click <b>Save.</b> You can also click <b>Save As</b>, enter a new name, and click <b>OK</b> to save a copy of the query.</li>
-</ol>
-
-
-<p><b>To delete a saved query:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Queries window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the <b>Options</b> button next to the query and choose <b>Delete</b> from the context menu.</li>
-	<li>Click <b>Yes</b> to confirm the deletion.</li>
-</ol>
-
-
-<p><b>To copy a saved query:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>Saved Queries</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Queries window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the <b>Options</b> button next to the query and choose <b>Clone</b> from the context menu.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-Beeswax displays the query in the Query Editor window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Change the query as necessary and then click <b>Save.</b> You can also click <b>Save As</b>, enter a new name, and click <b>Ok</b> to save a copy of the query.</li>
-</ol>
-
-
-
-<p><b>To copy a query in the Beeswax Query History window:</b></p>
-
-<ol>
-	<li>In the Beeswax window, click <b>History</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The Query History window displays.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>To display the queries for all users, click <b>Show everyone's queries</b>.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-The queries for all users display in the Query History window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Click the <b>Clone</b> link next to the query you want to copy.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" />
-A copy of the query displays in the Query Editor window.
-<br class="atl-forced-newline" />
-<br class="atl-forced-newline" /></li>
-	<li>Change the query, if necessary, and then click <b>Save As</b>, enter a new name, and click <b>OK</b> to save the query.</li>
-</ol>
-
-
-<h1><a name="Beeswax-WorkingwithTables"></a>Working with Tables</h1>
-
-<p>When working with Hive tables, you can use Beeswax to:</p>
-<ul>
-	<li><a href="#Beeswax-SelectingtheDatabase">Select a database</a></li>
-	<li><a href="#Beeswax-CreatingTables">Create tables</a></li>
-	<li><a href="#Beeswax-BrowsingTables">Browse tables</a></li>
-	<li><a href="#Beeswax-ImportingDataintoTables">Import data into tables</a></li>
-	<li>Drop tables (see <a href="#Beeswax-DroppingTables">Dropping Tables</a></li>
-	<li><a href="#Beeswax-ViewingaTable%27sLocation">View the location of a table</a></li>
-</ul>
-
-
-<p><a name="Beeswax-SelectingtheDatabase"></a></p>
-<h3><a name="Beeswax-SelectingtheDatabase"></a>Selecting the Database</h3>
-
-<ol>
-	<li>In the pane on the left, select the database from the DATABASE drop-down list.</li>
-</ol>
+<h3><a name="Catalog-ImportingYourOwnData"></a>Importing Your Own Data</h3>
 
+<p>If you want to import your own data instead of installing the sample tables, following the procedure in <a href="#Catalog-CreatingTables">Creating Tables</a>.</p>
 
-<p><a name="Beeswax-CreatingTables"></a></p>
+<p><a name="Catalog-CreatingTables"></a></p>
 
-<h3><a name="Beeswax-CreatingTables"></a>Creating Tables</h3>
+<h3><a name="Catalog-CreatingTables"></a>Creating Tables</h3>
 
-<p>Although you can create tables by executing the appropriate HQL DDL query commands, it is easier to create a table using the Beeswax table creation wizard.</p>
+<p>Although you can create tables by executing the appropriate HQL DDL query commands, it is easier to create a table using the Table Browser table creation wizard.</p>
 
 <p>There are two ways to create a table: from a file or manually.</p>
 
@@ -355,7 +78,7 @@ A copy of the query displays in the Query Editor window.
 <p><b>To create a table from a file</b>:</p>
 
 <ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
+	<li>In the Table Browser window, click <b>Tables</b>.</li>
 	<li>In the ACTIONS pane, click <b>Create a new table from a file</b>.<br/>
 The table creation wizard starts.
 <br class="atl-forced-newline" />
@@ -363,7 +86,7 @@ The table creation wizard starts.
 	<li>Follow the instructions in the wizard to create the table. The basic steps are:
 	<ul>
 		<li>Choose your input file.  The input file you specify must exist.<br/>
-Note that you can choose to have Beeswax create the table definition only based on the import file you select, without actually importing data from that file.</li>
+Note that you can choose to have Table Browser create the table definition only based on the import file you select, without actually importing data from that file.</li>
 		<li>Specify the column delimiter.</li>
 		<li>Define your columns, providing a name and selecting the type.
 <br class="atl-forced-newline" />
@@ -383,7 +106,7 @@ From the ACTIONS pane you can import new data into the table, browse the table,
 <p><b>To create a table manually:</b></p>
 
 <ol>
-	<li>In the Beeswax window, click <b>Tables</b>.</li>
+	<li>In the Table Browser window, click <b>Tables</b>.</li>
 	<li>In the ACTIONS pane, click <b>Create a new table manually</b>.
 <br class="atl-forced-newline" />
 <br class="atl-forced-newline" />
@@ -406,9 +129,9 @@ The Table Metadata window displays.</li>
 </ol>
 
 
-<p><a name="Beeswax-BrowsingTables"></a></p>
+<p><a name="Catalog-BrowsingTables"></a></p>
 
-<h3><a name="Beeswax-BrowsingTables"></a>Browsing Tables</h3>
+<h3><a name="Catalog-BrowsingTables"></a>Browsing Tables</h3>
 
 <p><b>To browse the data in a table:</b></p>
 
@@ -430,9 +153,9 @@ The table's metadata displays opened to the <b>Columns</b> tab. You can view the
 </ol>
 
 
-<p><a name="Beeswax-ImportingDataintoTables"></a></p>
+<p><a name="Catalog-ImportingDataintoTables"></a></p>
 
-<h3><a name="Beeswax-ImportingDataintoTables"></a>Importing Data into Tables</h3>
+<h3><a name="Catalog-ImportingDataintoTables"></a>Importing Data into Tables</h3>
 
 <p>When importing data, you can choose to append or overwrite the table's data with data from a file.</p>
 
@@ -458,9 +181,9 @@ The Table Metadata window displays.
 </ol>
 
 
-<p><a name="Beeswax-DroppingTables"></a></p>
+<p><a name="Catalog-DroppingTables"></a></p>
 
-<h3><a name="Beeswax-DroppingTables"></a>Dropping Tables</h3>
+<h3><a name="Catalog-DroppingTables"></a>Dropping Tables</h3>
 
 <p><b>To drop a table:</b></p>
 
@@ -478,9 +201,9 @@ The Table Metadata window displays.
 </ol>
 
 
-<p><a name="Beeswax-ViewingaTable%27sLocation"></a></p>
+<p><a name="Catalog-ViewingaTable%27sLocation"></a></p>
 
-<h3><a name="Beeswax-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
+<h3><a name="Catalog-ViewingaTable%27sLocation"></a>Viewing a Table's Location</h3>
 
 <p><b>To view a table's location:</b></p>