henrib commented on code in PR #6441:
URL: https://github.com/apache/hive/pull/6441#discussion_r3791962921
##########
standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCachingCatalog.java:
##########
@@ -33,65 +51,423 @@
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.hive.HiveCatalog;
+import org.apache.iceberg.hive.MetadataLocator;
import org.apache.iceberg.view.View;
import org.apache.iceberg.view.ViewBuilder;
+import org.jetbrains.annotations.TestOnly;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.benmanes.caffeine.cache.Ticker;
/**
* Class that wraps an Iceberg Catalog to cache tables.
*/
-public class HMSCachingCatalog extends CachingCatalog implements
SupportsNamespaces, ViewCatalog {
+public class HMSCachingCatalog extends CachingCatalog
+ implements SupportsNamespaces, ViewCatalog, HMSCachingCatalogMXBean,
Closeable {
+ protected static final Logger LOG =
LoggerFactory.getLogger(HMSCachingCatalog.class);
+
+ @TestOnly
+ private static SoftReference<HMSCachingCatalog> cacheRef = new
SoftReference<>(null);
+
+ @TestOnly
+ @SuppressWarnings("unchecked")
+ public static <C extends Catalog> C
getLatestCache(Function<HMSCachingCatalog, C> extractor) {
+ HMSCachingCatalog cache = cacheRef.get();
+ if (cache == null) {
+ return null;
+ }
+ return extractor == null ? (C) cache : extractor.apply(cache);
+ }
+
+ @TestOnly
+ public HiveCatalog getCatalog() {
+ return hiveCatalog;
+ }
+
+ // The underlying HiveCatalog instance.
private final HiveCatalog hiveCatalog;
-
- public HMSCachingCatalog(HiveCatalog catalog, long expiration) {
- super(catalog, true, expiration, Ticker.systemTicker());
+ // Duplicate because CachingCatalog doesn't expose the case sensitivity of
the underlying catalog,
+ // which is needed for canonicalizing identifiers before caching.
+ private final boolean caseSensitive;
+ // The locator.
+ private final MetadataLocator metadataLocator;
+ // An L1 small latency cache.
+ // This is used to cache the last cached time for each table identifier,
+ // so that we can skip location check for repeated access to the same table
within a short period of time,
+ // which can significantly reduce the latency for repeated access to the
same table.
+ private final Map<TableIdentifier, Long> l1Cache;
+ // The TTL for L1 cache (3s).
+ private final int l1Ttl;
+ // The L1 cache size.
+ private final int l1CacheSize;
+
+ // Metrics counters.
+ private final AtomicLong cacheHitCount = new AtomicLong(0);
+ private final AtomicLong cacheMissCount = new AtomicLong(0);
+ private final AtomicLong cacheLoadCount = new AtomicLong(0);
+ private final AtomicLong cacheInvalidateCount = new AtomicLong(0);
+ private final AtomicLong cacheMetaLoadCount = new AtomicLong(0);
+ // L1 cache metrics: counted only when the L2 (Caffeine) cache already has
the entry.
+ private final AtomicLong l1CacheHitCount = new AtomicLong(0);
+ private final AtomicLong l1CacheMissCount = new AtomicLong(0);
+
+ // JMX ObjectName under which this instance is registered (may be null if
registration failed).
+ private ObjectName jmxObjectName;
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs) {
+ this(catalog, expirationMs, /*caseSensitive*/ true);
+ }
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs, boolean
caseSensitive) {
+ super(catalog, caseSensitive, expirationMs, Ticker.systemTicker());
this.hiveCatalog = catalog;
+ this.caseSensitive = caseSensitive;
+ this.metadataLocator = new MetadataLocator(catalog);
+ Configuration conf = catalog.getConf();
+ if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_IN_TEST)) {
+ // Only keep a reference to the latest cache for testing purpose, so
that tests can manipulate the catalog.
+ cacheRef = new SoftReference<>(this);
+ }
+ int l1size = conf.getInt("hms.caching.catalog.l1.cache.size", 32);
+ int l1ttl = conf.getInt("hms.caching.catalog.l1.cache.ttl", 3_000);
+ if (l1size > 0 && l1ttl > 0) {
+ l1Cache = Collections.synchronizedMap(new LinkedHashMap<TableIdentifier,
Long>() {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<TableIdentifier, Long>
eldest) {
+ return size() > l1CacheSize;
+ }
+ });
+ l1Ttl = l1ttl;
+ l1CacheSize = l1size;
+ } else {
+ l1Cache = Collections.emptyMap();
+ l1Ttl = 0;
+ l1CacheSize = 0;
+ }
+ registerJmx(catalog.name());
+ }
+
+ /**
+ * Registers this instance as a JMX MBean.
+ *
+ * @param catalogName the catalog name, used to build the {@link ObjectName}
+ */
+ private void registerJmx(String catalogName) {
+ try {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ String sanitized = catalogName == null || catalogName.isEmpty()
+ ? "default"
+ : catalogName.replaceAll("[^a-zA-Z0-9.\\\\-]", "_");
+ ObjectName name = new
ObjectName("org.apache.iceberg.rest:type=HMSCachingCatalog,name=" + sanitized);
+ if (mbs.isRegistered(name)) {
+ mbs.unregisterMBean(name);
+ }
+ mbs.registerMBean(this, name);
+ this.jmxObjectName = name;
+ LOG.info("Registered JMX MBean: {}", name);
+ } catch (JMException e) {
+ LOG.warn("Failed to register JMX MBean for HMSCachingCatalog", e);
+ }
+ }
+
+ /**
+ * Callback when cache invalidates the entry for a given table identifier.
+ *
+ * @param tid the table identifier to invalidate
+ */
+ protected void onCacheInvalidate(TableIdentifier tid) {
Review Comment:
Adopted, thanks.
##########
standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCachingCatalog.java:
##########
@@ -33,65 +51,423 @@
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.hive.HiveCatalog;
+import org.apache.iceberg.hive.MetadataLocator;
import org.apache.iceberg.view.View;
import org.apache.iceberg.view.ViewBuilder;
+import org.jetbrains.annotations.TestOnly;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.benmanes.caffeine.cache.Ticker;
/**
* Class that wraps an Iceberg Catalog to cache tables.
*/
-public class HMSCachingCatalog extends CachingCatalog implements
SupportsNamespaces, ViewCatalog {
+public class HMSCachingCatalog extends CachingCatalog
+ implements SupportsNamespaces, ViewCatalog, HMSCachingCatalogMXBean,
Closeable {
+ protected static final Logger LOG =
LoggerFactory.getLogger(HMSCachingCatalog.class);
+
+ @TestOnly
+ private static SoftReference<HMSCachingCatalog> cacheRef = new
SoftReference<>(null);
+
+ @TestOnly
+ @SuppressWarnings("unchecked")
+ public static <C extends Catalog> C
getLatestCache(Function<HMSCachingCatalog, C> extractor) {
+ HMSCachingCatalog cache = cacheRef.get();
+ if (cache == null) {
+ return null;
+ }
+ return extractor == null ? (C) cache : extractor.apply(cache);
+ }
+
+ @TestOnly
+ public HiveCatalog getCatalog() {
+ return hiveCatalog;
+ }
+
+ // The underlying HiveCatalog instance.
private final HiveCatalog hiveCatalog;
-
- public HMSCachingCatalog(HiveCatalog catalog, long expiration) {
- super(catalog, true, expiration, Ticker.systemTicker());
+ // Duplicate because CachingCatalog doesn't expose the case sensitivity of
the underlying catalog,
+ // which is needed for canonicalizing identifiers before caching.
+ private final boolean caseSensitive;
+ // The locator.
+ private final MetadataLocator metadataLocator;
+ // An L1 small latency cache.
+ // This is used to cache the last cached time for each table identifier,
+ // so that we can skip location check for repeated access to the same table
within a short period of time,
+ // which can significantly reduce the latency for repeated access to the
same table.
+ private final Map<TableIdentifier, Long> l1Cache;
+ // The TTL for L1 cache (3s).
+ private final int l1Ttl;
+ // The L1 cache size.
+ private final int l1CacheSize;
+
+ // Metrics counters.
+ private final AtomicLong cacheHitCount = new AtomicLong(0);
+ private final AtomicLong cacheMissCount = new AtomicLong(0);
+ private final AtomicLong cacheLoadCount = new AtomicLong(0);
+ private final AtomicLong cacheInvalidateCount = new AtomicLong(0);
+ private final AtomicLong cacheMetaLoadCount = new AtomicLong(0);
+ // L1 cache metrics: counted only when the L2 (Caffeine) cache already has
the entry.
+ private final AtomicLong l1CacheHitCount = new AtomicLong(0);
+ private final AtomicLong l1CacheMissCount = new AtomicLong(0);
+
+ // JMX ObjectName under which this instance is registered (may be null if
registration failed).
+ private ObjectName jmxObjectName;
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs) {
+ this(catalog, expirationMs, /*caseSensitive*/ true);
+ }
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs, boolean
caseSensitive) {
+ super(catalog, caseSensitive, expirationMs, Ticker.systemTicker());
this.hiveCatalog = catalog;
+ this.caseSensitive = caseSensitive;
+ this.metadataLocator = new MetadataLocator(catalog);
+ Configuration conf = catalog.getConf();
+ if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_IN_TEST)) {
+ // Only keep a reference to the latest cache for testing purpose, so
that tests can manipulate the catalog.
+ cacheRef = new SoftReference<>(this);
+ }
+ int l1size = conf.getInt("hms.caching.catalog.l1.cache.size", 32);
+ int l1ttl = conf.getInt("hms.caching.catalog.l1.cache.ttl", 3_000);
+ if (l1size > 0 && l1ttl > 0) {
+ l1Cache = Collections.synchronizedMap(new LinkedHashMap<TableIdentifier,
Long>() {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<TableIdentifier, Long>
eldest) {
+ return size() > l1CacheSize;
+ }
+ });
+ l1Ttl = l1ttl;
+ l1CacheSize = l1size;
+ } else {
+ l1Cache = Collections.emptyMap();
+ l1Ttl = 0;
+ l1CacheSize = 0;
+ }
+ registerJmx(catalog.name());
+ }
+
+ /**
+ * Registers this instance as a JMX MBean.
+ *
+ * @param catalogName the catalog name, used to build the {@link ObjectName}
+ */
+ private void registerJmx(String catalogName) {
+ try {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ String sanitized = catalogName == null || catalogName.isEmpty()
+ ? "default"
+ : catalogName.replaceAll("[^a-zA-Z0-9.\\\\-]", "_");
+ ObjectName name = new
ObjectName("org.apache.iceberg.rest:type=HMSCachingCatalog,name=" + sanitized);
+ if (mbs.isRegistered(name)) {
+ mbs.unregisterMBean(name);
+ }
+ mbs.registerMBean(this, name);
+ this.jmxObjectName = name;
+ LOG.info("Registered JMX MBean: {}", name);
+ } catch (JMException e) {
+ LOG.warn("Failed to register JMX MBean for HMSCachingCatalog", e);
+ }
+ }
+
+ /**
+ * Callback when cache invalidates the entry for a given table identifier.
+ *
+ * @param tid the table identifier to invalidate
+ */
+ protected void onCacheInvalidate(TableIdentifier tid) {
+ long count = cacheInvalidateCount.incrementAndGet();
+ LOG.debug("Cache invalidate {}: {}", tid, count);
+ }
+
+ /**
+ * Callback when cache loads a table for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheLoad(TableIdentifier tid) {
Review Comment:
Adopted, thanks.
##########
standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCachingCatalog.java:
##########
@@ -33,65 +51,423 @@
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.hive.HiveCatalog;
+import org.apache.iceberg.hive.MetadataLocator;
import org.apache.iceberg.view.View;
import org.apache.iceberg.view.ViewBuilder;
+import org.jetbrains.annotations.TestOnly;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.benmanes.caffeine.cache.Ticker;
/**
* Class that wraps an Iceberg Catalog to cache tables.
*/
-public class HMSCachingCatalog extends CachingCatalog implements
SupportsNamespaces, ViewCatalog {
+public class HMSCachingCatalog extends CachingCatalog
+ implements SupportsNamespaces, ViewCatalog, HMSCachingCatalogMXBean,
Closeable {
+ protected static final Logger LOG =
LoggerFactory.getLogger(HMSCachingCatalog.class);
+
+ @TestOnly
+ private static SoftReference<HMSCachingCatalog> cacheRef = new
SoftReference<>(null);
+
+ @TestOnly
+ @SuppressWarnings("unchecked")
+ public static <C extends Catalog> C
getLatestCache(Function<HMSCachingCatalog, C> extractor) {
+ HMSCachingCatalog cache = cacheRef.get();
+ if (cache == null) {
+ return null;
+ }
+ return extractor == null ? (C) cache : extractor.apply(cache);
+ }
+
+ @TestOnly
+ public HiveCatalog getCatalog() {
+ return hiveCatalog;
+ }
+
+ // The underlying HiveCatalog instance.
private final HiveCatalog hiveCatalog;
-
- public HMSCachingCatalog(HiveCatalog catalog, long expiration) {
- super(catalog, true, expiration, Ticker.systemTicker());
+ // Duplicate because CachingCatalog doesn't expose the case sensitivity of
the underlying catalog,
+ // which is needed for canonicalizing identifiers before caching.
+ private final boolean caseSensitive;
+ // The locator.
+ private final MetadataLocator metadataLocator;
+ // An L1 small latency cache.
+ // This is used to cache the last cached time for each table identifier,
+ // so that we can skip location check for repeated access to the same table
within a short period of time,
+ // which can significantly reduce the latency for repeated access to the
same table.
+ private final Map<TableIdentifier, Long> l1Cache;
+ // The TTL for L1 cache (3s).
+ private final int l1Ttl;
+ // The L1 cache size.
+ private final int l1CacheSize;
+
+ // Metrics counters.
+ private final AtomicLong cacheHitCount = new AtomicLong(0);
+ private final AtomicLong cacheMissCount = new AtomicLong(0);
+ private final AtomicLong cacheLoadCount = new AtomicLong(0);
+ private final AtomicLong cacheInvalidateCount = new AtomicLong(0);
+ private final AtomicLong cacheMetaLoadCount = new AtomicLong(0);
+ // L1 cache metrics: counted only when the L2 (Caffeine) cache already has
the entry.
+ private final AtomicLong l1CacheHitCount = new AtomicLong(0);
+ private final AtomicLong l1CacheMissCount = new AtomicLong(0);
+
+ // JMX ObjectName under which this instance is registered (may be null if
registration failed).
+ private ObjectName jmxObjectName;
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs) {
+ this(catalog, expirationMs, /*caseSensitive*/ true);
+ }
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs, boolean
caseSensitive) {
+ super(catalog, caseSensitive, expirationMs, Ticker.systemTicker());
this.hiveCatalog = catalog;
+ this.caseSensitive = caseSensitive;
+ this.metadataLocator = new MetadataLocator(catalog);
+ Configuration conf = catalog.getConf();
+ if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_IN_TEST)) {
+ // Only keep a reference to the latest cache for testing purpose, so
that tests can manipulate the catalog.
+ cacheRef = new SoftReference<>(this);
+ }
+ int l1size = conf.getInt("hms.caching.catalog.l1.cache.size", 32);
+ int l1ttl = conf.getInt("hms.caching.catalog.l1.cache.ttl", 3_000);
+ if (l1size > 0 && l1ttl > 0) {
+ l1Cache = Collections.synchronizedMap(new LinkedHashMap<TableIdentifier,
Long>() {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<TableIdentifier, Long>
eldest) {
+ return size() > l1CacheSize;
+ }
+ });
+ l1Ttl = l1ttl;
+ l1CacheSize = l1size;
+ } else {
+ l1Cache = Collections.emptyMap();
+ l1Ttl = 0;
+ l1CacheSize = 0;
+ }
+ registerJmx(catalog.name());
+ }
+
+ /**
+ * Registers this instance as a JMX MBean.
+ *
+ * @param catalogName the catalog name, used to build the {@link ObjectName}
+ */
+ private void registerJmx(String catalogName) {
+ try {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ String sanitized = catalogName == null || catalogName.isEmpty()
+ ? "default"
+ : catalogName.replaceAll("[^a-zA-Z0-9.\\\\-]", "_");
+ ObjectName name = new
ObjectName("org.apache.iceberg.rest:type=HMSCachingCatalog,name=" + sanitized);
+ if (mbs.isRegistered(name)) {
+ mbs.unregisterMBean(name);
+ }
+ mbs.registerMBean(this, name);
+ this.jmxObjectName = name;
+ LOG.info("Registered JMX MBean: {}", name);
+ } catch (JMException e) {
+ LOG.warn("Failed to register JMX MBean for HMSCachingCatalog", e);
+ }
+ }
+
+ /**
+ * Callback when cache invalidates the entry for a given table identifier.
+ *
+ * @param tid the table identifier to invalidate
+ */
+ protected void onCacheInvalidate(TableIdentifier tid) {
+ long count = cacheInvalidateCount.incrementAndGet();
+ LOG.debug("Cache invalidate {}: {}", tid, count);
+ }
+
+ /**
+ * Callback when cache loads a table for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheLoad(TableIdentifier tid) {
+ long count = cacheLoadCount.incrementAndGet();
+ LOG.debug("Cache load {}: {}", tid, count);
+ }
+
+ /**
+ * Callback when cache hit for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheHit(TableIdentifier tid) {
Review Comment:
Adopted, thanks.
##########
standalone-metastore/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCachingCatalog.java:
##########
@@ -33,65 +51,423 @@
import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.hive.HiveCatalog;
+import org.apache.iceberg.hive.MetadataLocator;
import org.apache.iceberg.view.View;
import org.apache.iceberg.view.ViewBuilder;
+import org.jetbrains.annotations.TestOnly;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.github.benmanes.caffeine.cache.Ticker;
/**
* Class that wraps an Iceberg Catalog to cache tables.
*/
-public class HMSCachingCatalog extends CachingCatalog implements
SupportsNamespaces, ViewCatalog {
+public class HMSCachingCatalog extends CachingCatalog
+ implements SupportsNamespaces, ViewCatalog, HMSCachingCatalogMXBean,
Closeable {
+ protected static final Logger LOG =
LoggerFactory.getLogger(HMSCachingCatalog.class);
+
+ @TestOnly
+ private static SoftReference<HMSCachingCatalog> cacheRef = new
SoftReference<>(null);
+
+ @TestOnly
+ @SuppressWarnings("unchecked")
+ public static <C extends Catalog> C
getLatestCache(Function<HMSCachingCatalog, C> extractor) {
+ HMSCachingCatalog cache = cacheRef.get();
+ if (cache == null) {
+ return null;
+ }
+ return extractor == null ? (C) cache : extractor.apply(cache);
+ }
+
+ @TestOnly
+ public HiveCatalog getCatalog() {
+ return hiveCatalog;
+ }
+
+ // The underlying HiveCatalog instance.
private final HiveCatalog hiveCatalog;
-
- public HMSCachingCatalog(HiveCatalog catalog, long expiration) {
- super(catalog, true, expiration, Ticker.systemTicker());
+ // Duplicate because CachingCatalog doesn't expose the case sensitivity of
the underlying catalog,
+ // which is needed for canonicalizing identifiers before caching.
+ private final boolean caseSensitive;
+ // The locator.
+ private final MetadataLocator metadataLocator;
+ // An L1 small latency cache.
+ // This is used to cache the last cached time for each table identifier,
+ // so that we can skip location check for repeated access to the same table
within a short period of time,
+ // which can significantly reduce the latency for repeated access to the
same table.
+ private final Map<TableIdentifier, Long> l1Cache;
+ // The TTL for L1 cache (3s).
+ private final int l1Ttl;
+ // The L1 cache size.
+ private final int l1CacheSize;
+
+ // Metrics counters.
+ private final AtomicLong cacheHitCount = new AtomicLong(0);
+ private final AtomicLong cacheMissCount = new AtomicLong(0);
+ private final AtomicLong cacheLoadCount = new AtomicLong(0);
+ private final AtomicLong cacheInvalidateCount = new AtomicLong(0);
+ private final AtomicLong cacheMetaLoadCount = new AtomicLong(0);
+ // L1 cache metrics: counted only when the L2 (Caffeine) cache already has
the entry.
+ private final AtomicLong l1CacheHitCount = new AtomicLong(0);
+ private final AtomicLong l1CacheMissCount = new AtomicLong(0);
+
+ // JMX ObjectName under which this instance is registered (may be null if
registration failed).
+ private ObjectName jmxObjectName;
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs) {
+ this(catalog, expirationMs, /*caseSensitive*/ true);
+ }
+
+ public HMSCachingCatalog(HiveCatalog catalog, long expirationMs, boolean
caseSensitive) {
+ super(catalog, caseSensitive, expirationMs, Ticker.systemTicker());
this.hiveCatalog = catalog;
+ this.caseSensitive = caseSensitive;
+ this.metadataLocator = new MetadataLocator(catalog);
+ Configuration conf = catalog.getConf();
+ if (HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_IN_TEST)) {
+ // Only keep a reference to the latest cache for testing purpose, so
that tests can manipulate the catalog.
+ cacheRef = new SoftReference<>(this);
+ }
+ int l1size = conf.getInt("hms.caching.catalog.l1.cache.size", 32);
+ int l1ttl = conf.getInt("hms.caching.catalog.l1.cache.ttl", 3_000);
+ if (l1size > 0 && l1ttl > 0) {
+ l1Cache = Collections.synchronizedMap(new LinkedHashMap<TableIdentifier,
Long>() {
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<TableIdentifier, Long>
eldest) {
+ return size() > l1CacheSize;
+ }
+ });
+ l1Ttl = l1ttl;
+ l1CacheSize = l1size;
+ } else {
+ l1Cache = Collections.emptyMap();
+ l1Ttl = 0;
+ l1CacheSize = 0;
+ }
+ registerJmx(catalog.name());
+ }
+
+ /**
+ * Registers this instance as a JMX MBean.
+ *
+ * @param catalogName the catalog name, used to build the {@link ObjectName}
+ */
+ private void registerJmx(String catalogName) {
+ try {
+ MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+ String sanitized = catalogName == null || catalogName.isEmpty()
+ ? "default"
+ : catalogName.replaceAll("[^a-zA-Z0-9.\\\\-]", "_");
+ ObjectName name = new
ObjectName("org.apache.iceberg.rest:type=HMSCachingCatalog,name=" + sanitized);
+ if (mbs.isRegistered(name)) {
+ mbs.unregisterMBean(name);
+ }
+ mbs.registerMBean(this, name);
+ this.jmxObjectName = name;
+ LOG.info("Registered JMX MBean: {}", name);
+ } catch (JMException e) {
+ LOG.warn("Failed to register JMX MBean for HMSCachingCatalog", e);
+ }
+ }
+
+ /**
+ * Callback when cache invalidates the entry for a given table identifier.
+ *
+ * @param tid the table identifier to invalidate
+ */
+ protected void onCacheInvalidate(TableIdentifier tid) {
+ long count = cacheInvalidateCount.incrementAndGet();
+ LOG.debug("Cache invalidate {}: {}", tid, count);
+ }
+
+ /**
+ * Callback when cache loads a table for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheLoad(TableIdentifier tid) {
+ long count = cacheLoadCount.incrementAndGet();
+ LOG.debug("Cache load {}: {}", tid, count);
+ }
+
+ /**
+ * Callback when cache hit for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheHit(TableIdentifier tid) {
+ long count = cacheHitCount.incrementAndGet();
+ LOG.debug("Cache hit {} : {}", tid, count);
+ }
+
+ /**
+ * Callback when cache miss occurs for a given table identifier.
+ *
+ * @param tid the table identifier
+ */
+ protected void onCacheMiss(TableIdentifier tid) {
Review Comment:
Adopted, thanks.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
