Skip to content

HIVE-29429: Support multiple parent classes in HMSHander #6377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dengzhhu653 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

HIVE-29429: Support multiple parent classes in HMSHander #6377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb921de
HIVE-29429:
dengzhhu653 Feb 11, 2026
8e7d128
deprecated methods
dengzhhu653 Mar 18, 2026
861172d
Support multiple parent classes in HMSHander
dengzhhu653 Mar 18, 2026
ccf4fdb
fix
dengzhhu653 Mar 19, 2026
c8ebf56
fix init
dengzhhu653 Mar 19, 2026
4a5c32a
review - 1
dengzhhu653 Mar 20, 2026
4a3102c
fix conflict
dengzhhu653 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.conf.HiveConfForTest;
import org.apache.hadoop.hive.metastore.api.MetaException;
import org.apache.hadoop.hive.metastore.handler.BaseHandler;
import org.apache.hadoop.hive.ql.DriverFactory;
import org.apache.hadoop.hive.ql.IDriver;
import org.apache.hadoop.hive.ql.metadata.Hive;
Expand Down Expand Up @@ -55,8 +56,7 @@ public class TestMetastoreVersion {

@Before
public void setUp() throws Exception {

Field defDb = HMSHandler.class.getDeclaredField("currentUrl");
Field defDb = BaseHandler.class.getDeclaredField("currentUrl");
defDb.setAccessible(true);
defDb.set(null, null);
// reset defaults
Expand Down
3,443 changes: 154 additions & 3,289 deletions ...metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandler.java
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions ...re/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HMSHandlerContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Optional;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.metastore.handler.BaseHandler;
import org.apache.hadoop.hive.metastore.txn.TxnStore;
import org.apache.hadoop.hive.metastore.txn.TxnUtils;

Expand All @@ -38,7 +39,7 @@ public final class HMSHandlerContext {
private TxnStore txnStore;

// Thread local HMSHandler used during shutdown to notify meta listeners
private HMSHandler hmsHandler;
private BaseHandler hmsHandler;

// Thread local configuration is needed as many threads could make changes
// to the conf using the connection hook
Expand All @@ -61,7 +62,7 @@ public static Optional<RawStore> getRawStore() {
return Optional.ofNullable(context.get().rawStore);
}

public static Optional<HMSHandler> getHMSHandler() {
public static Optional<BaseHandler> getHMSHandler() {
return Optional.ofNullable(context.get().hmsHandler);
}

Expand Down Expand Up @@ -96,7 +97,7 @@ public static void setTxnStore(TxnStore txnStore) {
context.get().txnStore = txnStore;
}

public static void setHMSHandler(HMSHandler hmsHandler) {
public static void setHMSHandler(BaseHandler hmsHandler) {
context.get().hmsHandler = hmsHandler;
}

Expand Down
2 changes: 1 addition & 1 deletion ...astore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreInit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static boolean updateConnectionURL(Configuration originalConf, Configuration act
return false;
}

static String getConnectionURL(Configuration conf) {
public static String getConnectionURL(Configuration conf) {
return MetastoreConf.getVar(conf, ConfVars.CONNECT_URL_KEY, "");
}

Expand Down
3 changes: 2 additions & 1 deletion ...tastore-server/src/main/java/org/apache/hadoop/hive/metastore/TSetIpAddressProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore;
import org.apache.hadoop.hive.metastore.api.ThriftHiveMetastore.Iface;
import org.apache.hadoop.hive.metastore.handler.BaseHandler;
import org.apache.thrift.TException;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.transport.TSocket;
Expand Down Expand Up @@ -56,6 +57,6 @@ protected void setIpAddress(final TProtocol in) {
}

protected void setIpAddress(final Socket inSocket) {
HMSHandler.setThreadLocalIpAddress(inSocket.getInetAddress().getHostAddress());
BaseHandler.setThreadLocalIpAddress(inSocket.getInetAddress().getHostAddress());
}
}
2 changes: 1 addition & 1 deletion ...erver/src/main/java/org/apache/hadoop/hive/metastore/TransactionalValidationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public final class TransactionalValidationListener extends MetaStorePreEventList

private final Set<String> supportedCatalogs = new HashSet<String>();

TransactionalValidationListener(Configuration conf) {
public TransactionalValidationListener(Configuration conf) {
super(conf);
supportedCatalogs.add("hive");
}
Expand Down
2 changes: 1 addition & 1 deletion ...re/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/CachedStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@

import com.google.common.annotations.VisibleForTesting;

import static org.apache.hadoop.hive.metastore.HMSHandler.getPartValsFromName;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.findStaleColumns;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.getPartValsFromName;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog;
import static org.apache.hadoop.hive.metastore.utils.StringUtils.normalizeIdentifier;

Expand Down
2 changes: 1 addition & 1 deletion ...-server/src/main/java/org/apache/hadoop/hive/metastore/directsql/DirectSqlUpdatePart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
import java.util.stream.Collectors;

import static org.apache.hadoop.hive.common.StatsSetupConst.COLUMN_STATS_ACCURATE;
import static org.apache.hadoop.hive.metastore.HMSHandler.getPartValsFromName;
import static org.apache.hadoop.hive.metastore.directsql.MetastoreDirectSqlUtils.extractSqlClob;
import static org.apache.hadoop.hive.metastore.directsql.MetastoreDirectSqlUtils.extractSqlInt;
import static org.apache.hadoop.hive.metastore.directsql.MetastoreDirectSqlUtils.extractSqlLong;
import static org.apache.hadoop.hive.metastore.directsql.MetastoreDirectSqlUtils.getModelIdentity;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.getPartValsFromName;

/**
* This class contains the optimizations for MetaStore that rely on direct SQL access to
Expand Down
2 changes: 1 addition & 1 deletion ...server/src/main/java/org/apache/hadoop/hive/metastore/handler/AppendPartitionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.hive.metastore.HMSHandler.getPartValsFromName;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.canUpdateStats;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.getPartValsFromName;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.updatePartitionStatsFast;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreServerUtils.validatePartitionNameCharacters;
import static org.apache.hadoop.hive.metastore.utils.MetaStoreUtils.getDefaultCatalog;
Expand Down
Loading
Loading