Skip to content
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

Jump to bottom

Add personalized configuration parameters for each metastore. #315

Merged
merged 14 commits into from
May 27, 2024
Merged

Add personalized configuration parameters for each metastore. #315

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d94d0a9
Add personalized configuration parameters for each metastore.
Apr 14, 2024
5b43c27
Add personalized configuration parameters for each metastore
Apr 19, 2024
e9a93a1
Merge branch 'ExpediaGroup:hive-3.x' into hive-3.x
yangyuxia Apr 19, 2024
394250d
Recover
Apr 22, 2024
14abc77
Update junit test
May 11, 2024
877a76a
Update Junit Test
May 11, 2024
085d7fc
Update Junit Test
May 11, 2024
cb7b7bf
Update Junit Test
May 13, 2024
8307404
Format the code and update the readme
May 24, 2024
f837b2e
Revert
May 25, 2024
bc64c92
Update FederatedMetaStoreTest.java
patduin May 27, 2024
8cb4b22
Update PrimaryMetaStoreTest.java
patduin May 27, 2024
5bd959c
Update AbstractMetaStore.java
patduin May 27, 2024
23258d2
Update YamlFederatedMetaStoreStorageTest.java
patduin May 27, 2024
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
22 changes: 17 additions & 5 deletions ...ava/com/hotels/bdp/waggledance/client/CloseableThriftHiveMetastoreIfaceClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@

import static com.hotels.bdp.waggledance.api.model.ConnectionType.TUNNELED;

import java.util.Collections;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.*;
import java.util.concurrent.TimeUnit;

import com.hotels.bdp.waggledance.context.CommonBeans;
import org.apache.hadoop.hive.conf.HiveConf.ConfVars;

import lombok.AllArgsConstructor;
Expand All @@ -45,7 +43,21 @@ public class CloseableThriftHiveMetastoreIfaceClientFactory {
public CloseableThriftHiveMetastoreIface newInstance(AbstractMetaStore metaStore) {
Map<String, String> properties = new HashMap<>();
if (waggleDanceConfiguration.getConfigurationProperties() != null) {
properties.putAll(waggleDanceConfiguration.getConfigurationProperties());
// properties.putAll(waggleDanceConfiguration.getConfigurationProperties());
Map<String, String> serverConfigMap=waggleDanceConfiguration.getConfigurationProperties();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest we move these properties to the AbstractMetastore class and make it part of the waggle-dance-federation.yml and this code can become much simpler like:

properties.putAll(waggleDanceConfiguration.getConfigurationProperties());
//override per metastore
properties.putAll(metastore.getConfigurationProperties());

Set<String> keySet=serverConfigMap.keySet();

for(String key:keySet){
if(!key.startsWith(CommonBeans.WD_HMS + ".")){
properties.put(key,properties.get(key));
}
}
String hmsPrefix = CommonBeans.WD_HMS + "." + metaStore.getName() + ".";
for(String key:keySet){
if(key.startsWith(hmsPrefix)){
properties.put(key.substring(hmsPrefix.length()),properties.get(key));
}
}
}
return newHiveInstance(metaStore, properties);
}
Expand Down
1 change: 1 addition & 0 deletions waggle-dance-core/src/main/java/com/hotels/bdp/waggledance/context/CommonBeans.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

@org.springframework.context.annotation.Configuration
public class CommonBeans {
public static final String WD_HMS = "wd-metastore";

@Bean
public HiveConf hiveConf(WaggleDanceConfiguration waggleDanceConfiguration) {
Expand Down