Skip to content

Add SearchBackend #2879

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

Draft
wslulciuc wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add SearchBackend #2879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions api/src/main/java/marquez/MarquezContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@
import marquez.service.OpenLineageService;
import marquez.service.RunService;
import marquez.service.RunTransitionListener;
import marquez.service.SearchService;
import marquez.service.ServiceFactory;
import marquez.service.SourceService;
import marquez.service.TagService;
import marquez.service.models.Tag;
import marquez.service.v2beta;
import org.jdbi.v3.core.Jdbi;

@Getter
Expand Down Expand Up @@ -91,7 +91,7 @@ public final class MarquezContext {
@Getter private final OpenLineageService openLineageService;
@Getter private final LineageService lineageService;
@Getter private final ColumnLineageService columnLineageService;
@Getter private final SearchService searchService;
@Getter private final v2beta.SearchService searchService;
@Getter private final NamespaceResource namespaceResource;
@Getter private final SourceResource sourceResource;
@Getter private final DatasetResource datasetResource;
Expand Down Expand Up @@ -148,7 +148,7 @@ private MarquezContext(
this.openLineageService = new OpenLineageService(baseDao, runService);
this.lineageService = new LineageService(lineageDao, jobDao);
this.columnLineageService = new ColumnLineageService(columnLineageDao, datasetFieldDao);
this.searchService = new SearchService(searchConfig);
this.searchService = new v2beta.SearchService(searchConfig);
this.jdbiException = new JdbiExceptionExceptionMapper();
this.jsonException = new JsonProcessingExceptionMapper();
final ServiceFactory serviceFactory =
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/marquez/api/v2beta/SearchResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
import lombok.NonNull;
import lombok.ToString;
import lombok.extern.slf4j.Slf4j;
import marquez.service.SearchService;
import marquez.service.ServiceFactory;
import marquez.service.v2beta;
import org.opensearch.client.opensearch.core.SearchResponse;
import org.opensearch.client.opensearch.core.search.Hit;

@Slf4j
@Path("/api/v2beta/search")
public class SearchResource {

private final SearchService searchService;
private final v2beta.SearchService searchService;

public SearchResource(@NonNull final ServiceFactory serviceFactory) {
this.searchService = serviceFactory.getSearchService();
Expand Down
254 changes: 0 additions & 254 deletions api/src/main/java/marquez/service/SearchService.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion api/src/main/java/marquez/service/ServiceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ public class ServiceFactory {
@NonNull DatasetFieldService datasetFieldService;
@NonNull LineageService lineageService;
@NonNull ColumnLineageService columnLineageService;
@NonNull SearchService searchService;
@NonNull v2beta.SearchService searchService;
}
Loading