Skip to content

Commit 0a9aa96

Browse files
author
Jack Ye
authored
Doc: refactor Hive documentation with catalog loading examples (#2544)
1 parent 30ec9b5 commit 0a9aa96

File tree

3 files changed

+298
-79
lines changed

3 files changed

+298
-79
lines changed

mr/src/main/java/org/apache/iceberg/mr/Catalogs.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@
4545
/**
4646
* Class for catalog resolution and accessing the common functions for {@link Catalog} API.
4747
* <p>
48-
* Catalog resolution happens in this order:
49-
* <ol>
50-
* <li>Custom catalog if specified by {@link InputFormatConfig#CATALOG_LOADER_CLASS}
51-
* <li>Hadoop or Hive catalog if specified by {@link InputFormatConfig#CATALOG}
52-
* <li>Hadoop Tables
53-
* </ol>
48+
* See {@link Catalogs#getCatalogType(Configuration, String)} for catalog type resolution strategy.
5449
*/
5550
public final class Catalogs {
5651

mr/src/main/java/org/apache/iceberg/mr/InputFormatConfig.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,26 @@ private InputFormatConfig() {
4949
public static final String SERIALIZED_TABLE_PREFIX = "iceberg.mr.serialized.table.";
5050
public static final String TABLE_CATALOG_PREFIX = "iceberg.mr.table.catalog.";
5151
public static final String LOCALITY = "iceberg.mr.locality";
52+
53+
/**
54+
* @deprecated please use {@link InputFormatConfig#CATALOG_TYPE_TEMPLATE} to specify the type of a catalog,
55+
* and set {@link InputFormatConfig#CATALOG_NAME} in table property.
56+
*/
57+
@Deprecated
5258
public static final String CATALOG = "iceberg.mr.catalog";
59+
60+
/**
61+
* @deprecated please use {@link InputFormatConfig#CATALOG_WAREHOUSE_TEMPLATE} to specify the warehouse location.
62+
*/
63+
@Deprecated
5364
public static final String HADOOP_CATALOG_WAREHOUSE_LOCATION = "iceberg.mr.catalog.hadoop.warehouse.location";
65+
66+
/**
67+
* @deprecated please use {@link InputFormatConfig#CATALOG_CLASS_TEMPLATE} to set catalog implementation.
68+
*/
69+
@Deprecated
5470
public static final String CATALOG_LOADER_CLASS = "iceberg.mr.catalog.loader.class";
71+
5572
public static final String SELECTED_COLUMNS = "iceberg.mr.selected.columns";
5673
public static final String EXTERNAL_TABLE_PURGE = "external.table.purge";
5774

0 commit comments

Comments
 (0)