diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index 55df495..1ee59bf 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -420,7 +420,7 @@
             return null;
         }
         while (MetadataManagerUtil.findDataset(mdTxnCtx, dvName, datasetName) == null) {
-            Synonym synonym = MetadataManagerUtil.findSynonym(mdTxnCtx, dvName, datasetName);
+            Synonym synonym = findSynonym(dvName, datasetName);
             if (synonym == null) {
                 return null;
             }
@@ -430,6 +430,10 @@
         return new Pair<>(dvName, datasetName);
     }
 
+    public Synonym findSynonym(DataverseName dataverseName, String synonymName) throws AlgebricksException {
+        return MetadataManagerUtil.findSynonym(mdTxnCtx, dataverseName, synonymName);
+    }
+
     @Override
     public IFunctionInfo lookupFunction(FunctionIdentifier fid) {
         return BuiltinFunctions.lookupFunction(fid);
