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

Get file urls in one query #904

Merged
merged 1 commit into from
Apr 22, 2024
Merged

Get file urls in one query #904

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
10 changes: 7 additions & 3 deletions server/src/main/java/org/eclipse/openvsx/LocalRegistryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ public VersionReferencesJson getVersionReferences(String namespace, String exten
? repositories.findActiveVersionsSorted(namespace, extension, pageRequest)
: repositories.findActiveVersionsSorted(namespace, extension, targetPlatform, pageRequest);

var fileUrls = storageUtil.getFileUrls(page.getContent(), UrlUtil.getBaseUrl(), withFileTypes(DOWNLOAD));

var json = new VersionReferencesJson();
json.offset = (int) page.getPageable().getOffset();
json.totalSize = (int) page.getTotalElements();
Expand All @@ -159,7 +161,7 @@ public VersionReferencesJson getVersionReferences(String namespace, String exten
versionRef.targetPlatform = extVersion.getTargetPlatform();
versionRef.engines = extVersion.getEnginesMap();
versionRef.url = UrlUtil.createApiVersionUrl(UrlUtil.getBaseUrl(), extVersion);
versionRef.files = storageUtil.getFileUrls(extVersion, UrlUtil.getBaseUrl(), withFileTypes(DOWNLOAD));
versionRef.files = fileUrls.get(extVersion.getId());
if(versionRef.files.containsKey(DOWNLOAD_SIG)) {
versionRef.files.put(PUBLIC_KEY, UrlUtil.getPublicKeyUrl(extVersion));
}
Expand Down Expand Up @@ -396,11 +398,13 @@ public NamespaceDetailsJson getNamespaceDetails(String namespaceName) {
: null;

var serverUrl = UrlUtil.getBaseUrl();
json.extensions = repositories.findLatestVersions(namespace).stream()
var extVersions = repositories.findLatestVersions(namespace);
var fileUrls = storageUtil.getFileUrls(extVersions, serverUrl, withFileTypes(DOWNLOAD, ICON));
json.extensions = extVersions.stream()
.map(extVersion -> {
var entry = extVersion.toSearchEntryJson();
entry.url = createApiUrl(serverUrl, "api", entry.namespace, entry.name);
entry.files = storageUtil.getFileUrls(extVersion, serverUrl, withFileTypes(DOWNLOAD, ICON));
entry.files = fileUrls.get(extVersion.getId());
if(entry.files.containsKey(DOWNLOAD_SIG)) {
entry.files.put(PUBLIC_KEY, UrlUtil.getPublicKeyUrl(extVersion));
}
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/java/org/eclipse/openvsx/UserAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,15 +187,15 @@ public List<ExtensionJson> getOwnExtensions() {
throw new ResponseStatusException(HttpStatus.FORBIDDEN);
}

var extVersions = repositories.findLatestVersions(user);
var types = new String[]{ DOWNLOAD, MANIFEST, ICON, README, LICENSE, CHANGELOG, VSIXMANIFEST };
return repositories.findExtensions(user)
.map(e -> repositories.findLatestVersion(e, null, false, false))
var fileUrls = storageUtil.getFileUrls(extVersions, UrlUtil.getBaseUrl(), types);
return extVersions.stream()
.map(latest -> {
var json = latest.toExtensionJson();
json.preview = latest.isPreview();
json.active = latest.getExtension().isActive();
json.files = storageUtil.getFileUrls(latest, UrlUtil.getBaseUrl(), types);

json.files = fileUrls.get(latest.getId());
return json;
})
.toList();
Expand Down
9 changes: 5 additions & 4 deletions server/src/main/java/org/eclipse/openvsx/admin/AdminService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,15 @@ public UserPublishInfoJson getUserPublishInfo(String provider, String loginName)
userPublishInfo.user = user.toUserJson();
eclipse.enrichUserJson(userPublishInfo.user, user);
userPublishInfo.activeAccessTokenNum = (int) repositories.countActiveAccessTokens(user);
userPublishInfo.extensions = repositories.findExtensions(user).stream()
.map(e -> repositories.findLatestVersion(e, null, false, false))
var extVersions = repositories.findLatestVersions(user);
var types = new String[]{DOWNLOAD, MANIFEST, ICON, README, LICENSE, CHANGELOG, VSIXMANIFEST};
var fileUrls = storageUtil.getFileUrls(extVersions, UrlUtil.getBaseUrl(), types);
userPublishInfo.extensions = extVersions.stream()
.map(latest -> {
var json = latest.toExtensionJson();
json.preview = latest.isPreview();
json.active = latest.getExtension().isActive();
json.files = storageUtil.getFileUrls(latest, UrlUtil.getBaseUrl(),
DOWNLOAD, MANIFEST, ICON, README, LICENSE, CHANGELOG, VSIXMANIFEST);
json.files = fileUrls.get(latest.getId());

return json;
})
Expand Down
178 changes: 148 additions & 30 deletions server/src/main/java/org/eclipse/openvsx/repositories/ExtensionVersionJooqRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,16 +449,24 @@ private List<ExtensionVersion> fetch(SelectQuery<Record> query) {
}

private ExtensionVersion toExtensionVersionFull(Record record) {
return toExtensionVersionFull(record, null);
return toExtensionVersionFull(record, null, null);
}

private ExtensionVersion toExtensionVersionFull(Record record, Extension extension) {
var extVersion = toExtensionVersionCommon(record, extension);
extVersion.setLicense(record.get(EXTENSION_VERSION.LICENSE));
extVersion.setHomepage(record.get(EXTENSION_VERSION.HOMEPAGE));
extVersion.setBugs(record.get(EXTENSION_VERSION.BUGS));
extVersion.setMarkdown(record.get(EXTENSION_VERSION.MARKDOWN));
extVersion.setQna(record.get(EXTENSION_VERSION.QNA));
private ExtensionVersion toExtensionVersionFull(
Record record,
Extension extension,
FieldMapper extensionVersionMapper
) {
if(extensionVersionMapper == null) {
extensionVersionMapper = new DefaultFieldMapper();
}

var extVersion = toExtensionVersionCommon(record, extension, extensionVersionMapper);
extVersion.setLicense(record.get(extensionVersionMapper.map(EXTENSION_VERSION.LICENSE)));
extVersion.setHomepage(record.get(extensionVersionMapper.map(EXTENSION_VERSION.HOMEPAGE)));
extVersion.setBugs(record.get(extensionVersionMapper.map(EXTENSION_VERSION.BUGS)));
extVersion.setMarkdown(record.get(extensionVersionMapper.map(EXTENSION_VERSION.MARKDOWN)));
extVersion.setQna(record.get(extensionVersionMapper.map(EXTENSION_VERSION.QNA)));

if(extension == null) {
var newExtension = extVersion.getExtension();
Expand Down Expand Up @@ -490,34 +498,38 @@ private ExtensionVersion toExtensionVersionFull(Record record, Extension extensi
}

private ExtensionVersion toExtensionVersion(Record record) {
var extVersion = toExtensionVersionCommon(record, null);
var extVersion = toExtensionVersionCommon(record, null, new DefaultFieldMapper());
extVersion.setType(ExtensionVersion.Type.MINIMAL);
return extVersion;
}

private ExtensionVersion toExtensionVersionCommon(Record record, Extension extension) {
private ExtensionVersion toExtensionVersionCommon(
Record record,
Extension extension,
FieldMapper extensionVersionMapper
) {
var converter = new ListOfStringConverter();

var extVersion = new ExtensionVersion();
extVersion.setId(record.get(EXTENSION_VERSION.ID));
extVersion.setVersion(record.get(EXTENSION_VERSION.VERSION));
extVersion.setTargetPlatform(record.get(EXTENSION_VERSION.TARGET_PLATFORM));
extVersion.setPreview(record.get(EXTENSION_VERSION.PREVIEW));
extVersion.setPreRelease(record.get(EXTENSION_VERSION.PRE_RELEASE));
extVersion.setTimestamp(record.get(EXTENSION_VERSION.TIMESTAMP));
extVersion.setDisplayName(record.get(EXTENSION_VERSION.DISPLAY_NAME));
extVersion.setDescription(record.get(EXTENSION_VERSION.DESCRIPTION));
extVersion.setEngines(toList(record.get(EXTENSION_VERSION.ENGINES), converter));
extVersion.setCategories(toList(record.get(EXTENSION_VERSION.CATEGORIES), converter));
extVersion.setTags(toList(record.get(EXTENSION_VERSION.TAGS), converter));
extVersion.setExtensionKind(toList(record.get(EXTENSION_VERSION.EXTENSION_KIND), converter));
extVersion.setRepository(record.get(EXTENSION_VERSION.REPOSITORY));
extVersion.setGalleryColor(record.get(EXTENSION_VERSION.GALLERY_COLOR));
extVersion.setGalleryTheme(record.get(EXTENSION_VERSION.GALLERY_THEME));
extVersion.setLocalizedLanguages(toList(record.get(EXTENSION_VERSION.LOCALIZED_LANGUAGES), converter));
extVersion.setDependencies(toList(record.get(EXTENSION_VERSION.DEPENDENCIES), converter));
extVersion.setBundledExtensions(toList(record.get(EXTENSION_VERSION.BUNDLED_EXTENSIONS), converter));
extVersion.setSponsorLink(record.get(EXTENSION_VERSION.SPONSOR_LINK));
extVersion.setId(record.get(extensionVersionMapper.map(EXTENSION_VERSION.ID)));
extVersion.setVersion(record.get(extensionVersionMapper.map(EXTENSION_VERSION.VERSION)));
extVersion.setTargetPlatform(record.get(extensionVersionMapper.map(EXTENSION_VERSION.TARGET_PLATFORM)));
extVersion.setPreview(record.get(extensionVersionMapper.map(EXTENSION_VERSION.PREVIEW)));
extVersion.setPreRelease(record.get(extensionVersionMapper.map(EXTENSION_VERSION.PRE_RELEASE)));
extVersion.setTimestamp(record.get(extensionVersionMapper.map(EXTENSION_VERSION.TIMESTAMP)));
extVersion.setDisplayName(record.get(extensionVersionMapper.map(EXTENSION_VERSION.DISPLAY_NAME)));
extVersion.setDescription(record.get(extensionVersionMapper.map(EXTENSION_VERSION.DESCRIPTION)));
extVersion.setEngines(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.ENGINES)), converter));
extVersion.setCategories(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.CATEGORIES)), converter));
extVersion.setTags(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.TAGS)), converter));
extVersion.setExtensionKind(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.EXTENSION_KIND)), converter));
extVersion.setRepository(record.get(extensionVersionMapper.map(EXTENSION_VERSION.REPOSITORY)));
extVersion.setGalleryColor(record.get(extensionVersionMapper.map(EXTENSION_VERSION.GALLERY_COLOR)));
extVersion.setGalleryTheme(record.get(extensionVersionMapper.map(EXTENSION_VERSION.GALLERY_THEME)));
extVersion.setLocalizedLanguages(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.LOCALIZED_LANGUAGES)), converter));
extVersion.setDependencies(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.DEPENDENCIES)), converter));
extVersion.setBundledExtensions(toList(record.get(extensionVersionMapper.map(EXTENSION_VERSION.BUNDLED_EXTENSIONS)), converter));
extVersion.setSponsorLink(record.get(extensionVersionMapper.map(EXTENSION_VERSION.SPONSOR_LINK)));

if(extension == null) {
var namespace = new Namespace();
Expand Down Expand Up @@ -653,7 +665,7 @@ public ExtensionVersion findLatest(
query.addJoin(USER_DATA, USER_DATA.ID.eq(PERSONAL_ACCESS_TOKEN.USER_DATA));
query.addJoin(SIGNATURE_KEY_PAIR, JoinType.LEFT_OUTER_JOIN, SIGNATURE_KEY_PAIR.ID.eq(EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID));
query.addConditions(EXTENSION_VERSION.EXTENSION_ID.eq(extension.getId()));
return query.fetchOne((record) -> toExtensionVersionFull(record, extension));
return query.fetchOne((record) -> toExtensionVersionFull(record, extension, null));
}

public List<ExtensionVersion> findLatest(Namespace namespace) {
Expand Down Expand Up @@ -716,6 +728,96 @@ public List<ExtensionVersion> findLatest(Namespace namespace) {
});
}

public List<ExtensionVersion> findLatest(UserData user) {
var latestQuery = findLatestQuery(null, false, false);
latestQuery.addSelect(
EXTENSION_VERSION.ID,
EXTENSION_VERSION.VERSION,
EXTENSION_VERSION.TARGET_PLATFORM,
EXTENSION_VERSION.PREVIEW,
EXTENSION_VERSION.PRE_RELEASE,
EXTENSION_VERSION.TIMESTAMP,
EXTENSION_VERSION.DISPLAY_NAME,
EXTENSION_VERSION.DESCRIPTION,
EXTENSION_VERSION.ENGINES,
EXTENSION_VERSION.CATEGORIES,
EXTENSION_VERSION.TAGS,
EXTENSION_VERSION.EXTENSION_KIND,
EXTENSION_VERSION.LICENSE,
EXTENSION_VERSION.HOMEPAGE,
EXTENSION_VERSION.REPOSITORY,
EXTENSION_VERSION.SPONSOR_LINK,
EXTENSION_VERSION.BUGS,
EXTENSION_VERSION.MARKDOWN,
EXTENSION_VERSION.GALLERY_COLOR,
EXTENSION_VERSION.GALLERY_THEME,
EXTENSION_VERSION.LOCALIZED_LANGUAGES,
EXTENSION_VERSION.QNA,
EXTENSION_VERSION.DEPENDENCIES,
EXTENSION_VERSION.BUNDLED_EXTENSIONS,
EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID,
EXTENSION_VERSION.PUBLISHED_WITH_ID
);
latestQuery.addConditions(EXTENSION_VERSION.EXTENSION_ID.eq(EXTENSION.ID));
var latest = latestQuery.asTable();

var query = dsl.selectQuery();
query.addSelect(
NAMESPACE.ID,
NAMESPACE.NAME,
NAMESPACE.DISPLAY_NAME,
NAMESPACE.PUBLIC_ID,
EXTENSION.ID,
EXTENSION.NAME,
EXTENSION.PUBLIC_ID,
EXTENSION.AVERAGE_RATING,
EXTENSION.REVIEW_COUNT,
EXTENSION.DOWNLOAD_COUNT,
EXTENSION.PUBLISHED_DATE,
EXTENSION.LAST_UPDATED_DATE,
latest.field(EXTENSION_VERSION.ID),
latest.field(EXTENSION_VERSION.VERSION),
latest.field(EXTENSION_VERSION.TARGET_PLATFORM),
latest.field(EXTENSION_VERSION.PREVIEW),
latest.field(EXTENSION_VERSION.PRE_RELEASE),
latest.field(EXTENSION_VERSION.TIMESTAMP),
latest.field(EXTENSION_VERSION.DISPLAY_NAME),
latest.field(EXTENSION_VERSION.DESCRIPTION),
latest.field(EXTENSION_VERSION.ENGINES),
latest.field(EXTENSION_VERSION.CATEGORIES),
latest.field(EXTENSION_VERSION.TAGS),
latest.field(EXTENSION_VERSION.EXTENSION_KIND),
latest.field(EXTENSION_VERSION.LICENSE),
latest.field(EXTENSION_VERSION.HOMEPAGE),
latest.field(EXTENSION_VERSION.REPOSITORY),
latest.field(EXTENSION_VERSION.SPONSOR_LINK),
latest.field(EXTENSION_VERSION.BUGS),
latest.field(EXTENSION_VERSION.MARKDOWN),
latest.field(EXTENSION_VERSION.GALLERY_COLOR),
latest.field(EXTENSION_VERSION.GALLERY_THEME),
latest.field(EXTENSION_VERSION.LOCALIZED_LANGUAGES),
latest.field(EXTENSION_VERSION.QNA),
latest.field(EXTENSION_VERSION.DEPENDENCIES),
latest.field(EXTENSION_VERSION.BUNDLED_EXTENSIONS),
SIGNATURE_KEY_PAIR.PUBLIC_ID,
USER_DATA.ID,
USER_DATA.ROLE,
USER_DATA.LOGIN_NAME,
USER_DATA.FULL_NAME,
USER_DATA.AVATAR_URL,
USER_DATA.PROVIDER_URL,
USER_DATA.PROVIDER
);
query.addFrom(NAMESPACE);
query.addJoin(EXTENSION, EXTENSION.NAMESPACE_ID.eq(NAMESPACE.ID));
query.addJoin(latest, JoinType.CROSS_APPLY, DSL.condition(true));
query.addJoin(SIGNATURE_KEY_PAIR, JoinType.LEFT_OUTER_JOIN, SIGNATURE_KEY_PAIR.ID.eq(latest.field(EXTENSION_VERSION.SIGNATURE_KEY_PAIR_ID)));
query.addJoin(PERSONAL_ACCESS_TOKEN, JoinType.LEFT_OUTER_JOIN, PERSONAL_ACCESS_TOKEN.ID.eq(latest.field(EXTENSION_VERSION.PUBLISHED_WITH_ID)));
query.addJoin(USER_DATA, USER_DATA.ID.eq(PERSONAL_ACCESS_TOKEN.USER_DATA));
query.addConditions(PERSONAL_ACCESS_TOKEN.USER_DATA.eq(user.getId()));
return query.fetch(record -> toExtensionVersionFull(record, null, new TableFieldMapper(latest)));
}

public ExtensionVersion findLatestForAllUrls(
Extension extension,
String targetPlatform,
Expand Down Expand Up @@ -849,4 +951,20 @@ public List<String> findDistinctTargetPlatforms(Extension extension) {
.and(EXTENSION_VERSION.ACTIVE.eq(true))
.fetch(EXTENSION_VERSION.TARGET_PLATFORM);
}

private interface FieldMapper {
<T> Field<T> map(Field<T> field);
}

private record TableFieldMapper(Table<Record> table) implements FieldMapper {
public <T> Field<T> map(Field<T> field) {
return table.field(field);
}
}

private static class DefaultFieldMapper implements FieldMapper {
public <T> Field<T> map(Field<T> field) {
return field;
}
}
}
4 changes: 4 additions & 0 deletions server/src/main/java/org/eclipse/openvsx/repositories/RepositoryService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,10 @@ public List<ExtensionVersion> findLatestVersions(Namespace namespace) {
return extensionVersionJooqRepo.findLatest(namespace);
}

public List<ExtensionVersion> findLatestVersions(UserData user) {
return extensionVersionJooqRepo.findLatest(user);
}

public List<String> findExtensionTargetPlatforms(Extension extension) {
return extensionVersionJooqRepo.findDistinctTargetPlatforms(extension);
}
Expand Down
6 changes: 0 additions & 6 deletions server/src/main/java/org/eclipse/openvsx/storage/StorageUtilService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,12 +251,6 @@ private String getFileUrl(String name, ExtensionVersion extVersion, String serve
return UrlUtil.createApiFileUrl(serverUrl, extVersion, name);
}

@Observed
public Map<String, String> getFileUrls(ExtensionVersion extVersion, String serverUrl, String... types) {
var fileUrls = getFileUrls(List.of(extVersion), serverUrl, types);
return fileUrls.get(extVersion.getId());
}

/**
* Returns URLs for the given file types as a map of ExtensionVersion.id by a map of type by file URL, to be used in JSON response data.
*/
Expand Down
3 changes: 1 addition & 2 deletions server/src/test/java/org/eclipse/openvsx/admin/AdminAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,8 +483,7 @@ public void testGetUserPublishInfo() throws Exception {

Mockito.when(repositories.findUserByLoginName("github", "test")).thenReturn(user);
Mockito.when(repositories.countActiveAccessTokens(user)).thenReturn(1L);
Mockito.when(repositories.findExtensions(user))
.thenReturn(Streamable.of(versions.get(0).getExtension()));
Mockito.when(repositories.findLatestVersions(user)).thenReturn(versions);

mockMvc.perform(get("/admin/publisher/{provider}/{loginName}", "github", "test")
.with(user("admin_user").authorities(new SimpleGrantedAuthority(("ROLE_ADMIN"))))
Expand Down
1 change: 1 addition & 0 deletions server/src/test/java/org/eclipse/openvsx/repositories/RepositoryServiceSmokeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ void testExecuteQueries() {
() -> repositories.findLatestVersionForAllUrls(extension, "targetPlatform", false, false),
() -> repositories.findLatestVersion(extension, "targetPlatform", false, false),
() -> repositories.findLatestVersions(namespace),
() -> repositories.findLatestVersions(userData),
() -> repositories.findExtensionTargetPlatforms(extension)
);

Expand Down
Loading