(asterixdb) branch master updated: [NO ISSUE][*DB][CONTROL] Allow extension of INamespaceResolver

[wyk]

This is an automated email from the ASF dual-hosted git repository.

wyk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new ff6dfa6858 [NO ISSUE][*DB][CONTROL] Allow extension of 
INamespaceResolver
ff6dfa6858 is described below

commit ff6dfa6858c52a69fd09b0bcc05a8e63bdf003ed
Author: Michael Blow <michael.b...@couchbase.com>
AuthorDate: Fri May 31 19:10:33 2024 -0400

    [NO ISSUE][*DB][CONTROL] Allow extension of INamespaceResolver
    
    Change-Id: I37231085906ae9929cf715c9fd86af9931a80a65
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18334
    Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Michael Blow <mb...@apache.org>
    Reviewed-by: Hussain Towaileb <hussai...@gmail.com>
    Tested-by: Michael Blow <mb...@apache.org>
---
 .../java/org/apache/asterix/hyracks/bootstrap/CCApplication.java    | 6 +++++-
 .../java/org/apache/asterix/hyracks/bootstrap/NCApplication.java    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
index b8cd51aaf0..8cd24873cc 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/CCApplication.java
@@ -175,7 +175,7 @@ public class CCApplication extends BaseCCApplication {
                 
ccServiceCtx.getAppConfig().getBoolean(CompilerProperties.Option.COMPILER_ENABLE_DB_RESOLUTION);
         boolean cloudDeployment = 
ccServiceCtx.getAppConfig().getBoolean(CLOUD_DEPLOYMENT);
         boolean useDatabaseResolution = cloudDeployment && 
isDbResolutionEnabled;
-        INamespaceResolver namespaceResolver = new 
NamespaceResolver(useDatabaseResolution);
+        INamespaceResolver namespaceResolver = 
createNamespaceResolver(useDatabaseResolution);
         INamespacePathResolver namespacePathResolver = new 
NamespacePathResolver(useDatabaseResolution);
         ccExtensionManager = new CCExtensionManager(new 
ArrayList<>(getExtensions()), namespaceResolver, ccServiceCtx);
         IGlobalRecoveryManager globalRecoveryManager = 
createGlobalRecoveryManager();
@@ -218,6 +218,10 @@ public class CCApplication extends BaseCCApplication {
         jobCapacityController = new 
JobCapacityController(controllerService.getResourceManager());
     }
 
+    protected INamespaceResolver createNamespaceResolver(boolean 
useDatabaseResolution) {
+        return new NamespaceResolver(useDatabaseResolution);
+    }
+
     protected ICloudGuardian getCloudGuardian(CloudProperties cloudProperties) 
{
         return ICloudGuardian.NoOpCloudGuardian.INSTANCE;
     }
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
index fc22f45ab2..d5659cf090 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
@@ -164,7 +164,7 @@ public class NCApplication extends BaseNCApplication {
                 
ncServiceCtx.getAppConfig().getBoolean(CompilerProperties.Option.COMPILER_ENABLE_DB_RESOLUTION);
         boolean cloudDeployment = 
ncServiceCtx.getAppConfig().getBoolean(CLOUD_DEPLOYMENT);
         boolean useDatabaseResolution = cloudDeployment && 
isDbResolutionEnabled;
-        NamespaceResolver namespaceResolver = new 
NamespaceResolver(useDatabaseResolution);
+        INamespaceResolver namespaceResolver = 
createNamespaceResolver(useDatabaseResolution);
         NamespacePathResolver namespacePathResolver = new 
NamespacePathResolver(useDatabaseResolution);
         ncExtensionManager = new NCExtensionManager(new 
ArrayList<>(getExtensions()), cloudDeployment,
                 namespaceResolver, ncServiceCtx);
@@ -201,6 +201,10 @@ public class NCApplication extends BaseNCApplication {
         performLocalCleanUp();
     }
 
+    protected INamespaceResolver createNamespaceResolver(boolean 
useDatabaseResolution) {
+        return new NamespaceResolver(useDatabaseResolution);
+    }
+
     protected INcApplicationContext 
createNCApplicationContext(INCServiceContext ncServiceCtx,
             NCExtensionManager ncExtensionManager, IPropertiesFactory 
propertiesFactory,
             INamespaceResolver namespaceResolver, INamespacePathResolver 
namespacePathResolver)