pareshddevalia commented on code in PR #701: URL: https://github.com/apache/atlas/pull/701#discussion_r3710209419
########## repository/src/main/java/org/apache/atlas/glossary/GlossarySearchBuilder.java: ########## @@ -0,0 +1,316 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.atlas.glossary; + +import org.apache.atlas.SortOrder; +import org.apache.atlas.exception.AtlasBaseException; +import org.apache.atlas.model.glossary.AtlasGlossary; +import org.apache.atlas.model.glossary.AtlasGlossaryCategory; +import org.apache.atlas.model.glossary.AtlasGlossaryTerm; +import org.apache.atlas.model.glossary.GlossaryExportParameters; +import org.apache.atlas.model.glossary.GlossaryExportRow; +import org.apache.atlas.model.glossary.GlossarySearchParameters; +import org.apache.atlas.model.glossary.GlossarySearchResult; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** + * Builds paginated, nested JSON for glossary terms-list display. + * Reuses {@link GlossaryExportDataCollector} and {@link GlossaryExportFilter} so search filters match export filters. + */ +public class GlossarySearchBuilder { + private static final Logger LOG = LoggerFactory.getLogger(GlossarySearchBuilder.class); + + private final GlossaryService glossaryService; + + public GlossarySearchBuilder(GlossaryService glossaryService) { + this.glossaryService = glossaryService; + } + + public GlossarySearchResult search(GlossarySearchParameters parameters) throws AtlasBaseException { + GlossaryExportParameters exportParameters = toExportParameters(parameters); + GlossaryExportDataCollector collector = new GlossaryExportDataCollector(glossaryService); + GlossaryExportFilter filter = new GlossaryExportFilter(); + + List<GlossaryExportRow> rows = filter.apply(collector.collect(exportParameters), exportParameters); Review Comment: First here -> Duplicate getDetailedGlossary() in search. same glossary being loaded twice in a single search request ########## repository/src/main/java/org/apache/atlas/glossary/GlossarySearchBuilder.java: ########## @@ -0,0 +1,316 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.atlas.glossary; + +import org.apache.atlas.SortOrder; +import org.apache.atlas.exception.AtlasBaseException; +import org.apache.atlas.model.glossary.AtlasGlossary; +import org.apache.atlas.model.glossary.AtlasGlossaryCategory; +import org.apache.atlas.model.glossary.AtlasGlossaryTerm; +import org.apache.atlas.model.glossary.GlossaryExportParameters; +import org.apache.atlas.model.glossary.GlossaryExportRow; +import org.apache.atlas.model.glossary.GlossarySearchParameters; +import org.apache.atlas.model.glossary.GlossarySearchResult; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; + +/** + * Builds paginated, nested JSON for glossary terms-list display. + * Reuses {@link GlossaryExportDataCollector} and {@link GlossaryExportFilter} so search filters match export filters. + */ +public class GlossarySearchBuilder { + private static final Logger LOG = LoggerFactory.getLogger(GlossarySearchBuilder.class); + + private final GlossaryService glossaryService; + + public GlossarySearchBuilder(GlossaryService glossaryService) { + this.glossaryService = glossaryService; + } + + public GlossarySearchResult search(GlossarySearchParameters parameters) throws AtlasBaseException { + GlossaryExportParameters exportParameters = toExportParameters(parameters); + GlossaryExportDataCollector collector = new GlossaryExportDataCollector(glossaryService); + GlossaryExportFilter filter = new GlossaryExportFilter(); + + List<GlossaryExportRow> rows = filter.apply(collector.collect(exportParameters), exportParameters); + rows = filterByGlossaryName(rows, parameters); + sort(rows, parameters); + + long totalCount = rows.size(); + List<GlossaryExportRow> pageRows = paginate(rows, parameters); + + LOG.debug("Glossary search matched {} rows, returning page of {}", totalCount, pageRows.size()); + + return buildResult(pageRows, totalCount, parameters); + } + + private GlossaryExportParameters toExportParameters(GlossarySearchParameters parameters) { + GlossaryExportParameters exportParameters = new GlossaryExportParameters(); + + exportParameters.setRecordType(toRecordType(parameters.getGlossaryType())); + exportParameters.setStatusContains(parameters.getStatus()); + exportParameters.setClassificationContains(parameters.getClassificationContains()); + exportParameters.setSearchQuery(parameters.getSearchQuery()); + exportParameters.setExcludeDeleted(parameters.getExcludeDeleted()); + + if (parameters.getGlossary() != null && StringUtils.isNotEmpty(parameters.getGlossary().getGuid())) { + exportParameters.setGlossaryGuid(parameters.getGlossary().getGuid()); + } + + return exportParameters; + } + + private GlossaryExportParameters.RecordType toRecordType(GlossarySearchParameters.GlossaryType glossaryType) { + if (glossaryType == null || glossaryType == GlossarySearchParameters.GlossaryType.ALL) { + return GlossaryExportParameters.RecordType.ALL; + } + + if (glossaryType == GlossarySearchParameters.GlossaryType.TERM) { + return GlossaryExportParameters.RecordType.TERM; + } + + return GlossaryExportParameters.RecordType.CATEGORY; + } + + private List<GlossaryExportRow> filterByGlossaryName(List<GlossaryExportRow> rows, GlossarySearchParameters parameters) { + if (parameters.getGlossary() == null || StringUtils.isEmpty(parameters.getGlossary().getName())) { + return rows; + } + + String glossaryName = parameters.getGlossary().getName().toLowerCase(Locale.ROOT); + List<GlossaryExportRow> ret = new ArrayList<>(); + + for (GlossaryExportRow row : rows) { + if (row.getGlossaryName() != null && row.getGlossaryName().toLowerCase(Locale.ROOT).contains(glossaryName)) { + ret.add(row); + } + } + + return ret; + } + + private void sort(List<GlossaryExportRow> rows, GlossarySearchParameters parameters) { + Comparator<GlossaryExportRow> comparator = resolveComparator(parameters.getSortBy()); + boolean descending = parameters.getSortOrder() == SortOrder.DESCENDING; + + if (descending) { + comparator = comparator.reversed(); + } + + rows.sort(comparator); + } + + private Comparator<GlossaryExportRow> resolveComparator(String sortBy) { + if (StringUtils.isBlank(sortBy)) { + return Comparator.comparing(row -> StringUtils.defaultString(row.getName()), String.CASE_INSENSITIVE_ORDER); + } + + switch (sortBy.toLowerCase(Locale.ROOT)) { + case "glossaryname": + case "glossary": + return Comparator.comparing(row -> StringUtils.defaultString(row.getGlossaryName()), String.CASE_INSENSITIVE_ORDER); + case "status": + return Comparator.comparing(row -> StringUtils.defaultString(row.getStatus()), String.CASE_INSENSITIVE_ORDER); + case "qualifiedname": + return Comparator.comparing(row -> StringUtils.defaultString(row.getQualifiedName()), String.CASE_INSENSITIVE_ORDER); + case "recordtype": + case "type": + case "glossarytype": + return Comparator.comparing(row -> row.getRecordType() != null ? row.getRecordType().name() : "", String.CASE_INSENSITIVE_ORDER); + case "name": + default: + return Comparator.comparing(row -> StringUtils.defaultString(row.getName()), String.CASE_INSENSITIVE_ORDER); + } + } + + private List<GlossaryExportRow> paginate(List<GlossaryExportRow> rows, GlossarySearchParameters parameters) { + int offset = Math.max(0, parameters.getOffset()); + int limit = parameters.getLimit(); + + if (offset >= rows.size()) { + return Collections.emptyList(); + } + + if (limit <= 0) { + return new ArrayList<>(rows.subList(offset, rows.size())); + } + + int end = Math.min(offset + limit, rows.size()); + + return new ArrayList<>(rows.subList(offset, end)); + } + + private GlossarySearchResult buildResult(List<GlossaryExportRow> pageRows, long totalCount, GlossarySearchParameters parameters) + throws AtlasBaseException { + GlossarySearchResult result = new GlossarySearchResult(); + result.setApproximateCount(totalCount); + + if (CollectionUtils.isEmpty(pageRows)) { + result.setGlossary(Collections.emptyList()); + return result; + } + + Map<String, GlossarySearchResult.GlossaryDetail> glossaryByGuid = new LinkedHashMap<>(); + Map<String, AtlasGlossary.AtlasGlossaryExtInfo> extByGuid = new LinkedHashMap<>(); + + boolean includeTerms = parameters.getGlossaryType() != GlossarySearchParameters.GlossaryType.CATEGORY; + boolean includeCategories = parameters.getGlossaryType() != GlossarySearchParameters.GlossaryType.TERM; + + for (GlossaryExportRow row : pageRows) { + AtlasGlossary.AtlasGlossaryExtInfo ext = extByGuid.computeIfAbsent(row.getGlossaryGuid(), this::loadExtInfoSafely); Review Comment: second here -> Atlas hits again for the same full glossary data which is already loaded in same search method. ########## hbase-shaded-client-fixed/pom.xml: ########## @@ -73,28 +73,14 @@ </executions> </plugin> - <!-- Repack the jar --> + <!-- Repack unpacked hbase-shaded-client as the main project artifact --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> Review Comment: Why changes is required ########## repository/pom.xml: ########## @@ -301,6 +310,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.mockito</groupId> Review Comment: mockito-core is required ########## repository/src/main/java/org/apache/atlas/repository/graph/AtlasGraphProvider.java: ########## @@ -144,7 +144,7 @@ private static Integer getMaxRetryCount() { private static Long getRetrySleepTime() { initApplicationProperties(); - return (applicationProperties == null) ? 30000 : applicationProperties.getLong(GRAPH_REPOSITORY_RETRY_SLEEPTIME, 30000); + return (applicationProperties == null) ? 30000L : applicationProperties.getLong(GRAPH_REPOSITORY_RETRY_SLEEPTIME, 30000L); Review Comment: Is this required ########## repository/pom.xml: ########## @@ -80,6 +80,12 @@ <version>${commons-codec.version}</version> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> Review Comment: Is this required ########## repository/pom.xml: ########## @@ -168,6 +174,15 @@ <artifactId>hbase-client</artifactId> </dependency> + <!-- Required at runtime by Apache POI 5.x (XSSFWorkbook / XLSX export). + log4j-api is excluded from poi/poi-ooxml above to avoid duplicate logging + bindings, but POI still references org.apache.logging.log4j.Logger at class init. --> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j-api.version}</version> Review Comment: Check if this is required -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
