Skip to content
7 changes: 1 addition & 6 deletions mr/src/main/java/org/apache/iceberg/mr/Catalogs.java
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,7 @@
/**
* Class for catalog resolution and accessing the common functions for {@link Catalog} API.
* <p>
* Catalog resolution happens in this order:
* <ol>
* <li>Custom catalog if specified by {@link InputFormatConfig#CATALOG_LOADER_CLASS}
* <li>Hadoop or Hive catalog if specified by {@link InputFormatConfig#CATALOG}
* <li>Hadoop Tables
* </ol>
* See {@link Catalogs#getCatalogType(Configuration, String)} for catalog type resolution strategy.
*/
public final class Catalogs {

Expand Down
17 changes: 17 additions & 0 deletions mr/src/main/java/org/apache/iceberg/mr/InputFormatConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,26 @@ private InputFormatConfig() {
public static final String SERIALIZED_TABLE_PREFIX = "iceberg.mr.serialized.table.";
public static final String TABLE_CATALOG_PREFIX = "iceberg.mr.table.catalog.";
public static final String LOCALITY = "iceberg.mr.locality";

/**
* @deprecated please use {@link InputFormatConfig#CATALOG_TYPE_TEMPLATE} to specify the type of a catalog,
* and set {@link InputFormatConfig#CATALOG_NAME} in table property.
*/
@Deprecated
public static final String CATALOG = "iceberg.mr.catalog";

/**
* @deprecated please use {@link InputFormatConfig#CATALOG_WAREHOUSE_TEMPLATE} to specify the warehouse location.
*/
@Deprecated
public static final String HADOOP_CATALOG_WAREHOUSE_LOCATION = "iceberg.mr.catalog.hadoop.warehouse.location";

/**
* @deprecated please use {@link InputFormatConfig#CATALOG_CLASS_TEMPLATE} to set catalog implementation.
*/
@Deprecated
public static final String CATALOG_LOADER_CLASS = "iceberg.mr.catalog.loader.class";

public static final String SELECTED_COLUMNS = "iceberg.mr.selected.columns";
public static final String EXTERNAL_TABLE_PURGE = "external.table.purge";

Expand Down
Loading