dawidwys commented on a change in pull request #8404: [FLINK-11476][table]
Create CatalogManager to manage multiple catalogs
URL: https://github.com/apache/flink/pull/8404#discussion_r284853604
##########
File path:
flink-table/flink-table-api-java/src/main/java/org/apache/flink/table/catalog/CatalogManager.java
##########
@@ -250,56 +258,64 @@ public void setCurrentDatabase(String databaseName)
throws DatabaseNotExistExcep
public Optional<CatalogTableOperation> resolveTable(String...
tablePath) {
checkArgument(tablePath != null && tablePath.length != 0,
"Table path must not be null or empty.");
- List<String> defaultPath = new ArrayList<>();
- defaultPath.add(currentCatalogName);
- defaultPath.add(currentDatabaseName);
+ List<String> userPath = asList(tablePath);
- List<String> userPath = Arrays.asList(tablePath);
- defaultPath.addAll(userPath);
+ List<List<String>> prefixes = asList(
+ asList(currentCatalogName, currentDatabaseName),
+ singletonList(currentCatalogName),
+ emptyList()
+ );
- Optional<CatalogTableOperation> inDefaultPath =
lookupPath(defaultPath);
-
- if (inDefaultPath.isPresent()) {
- return inDefaultPath;
- } else {
- return lookupPath(userPath);
+ for (List<String> prefix : prefixes) {
+ Optional<CatalogTableOperation> potentialTable =
lookupPath(prefix, userPath);
+ if (potentialTable.isPresent()) {
+ return potentialTable;
+ }
}
+
+ return Optional.empty();
}
- private Optional<CatalogTableOperation> lookupPath(List<String> path) {
+ private Optional<CatalogTableOperation> lookupPath(List<String> prefix,
List<String> userPath) {
try {
- Optional<TableSchema> potentialTable =
lookupCatalogTable(path);
+ List<String> path = new ArrayList<>(prefix);
+ path.addAll(userPath);
+
+ Optional<CatalogTableOperation> potentialTable =
lookupCatalogTable(path);
Review comment:
Ok, I misunderstood you.
I don't like this approach as this way both `lookupPath` and
`lookupCatalogTable` validate structure of the `Catalog` path. In my approach
the whole logic is enclosed in a single lookup**CatalogTable** method.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
