Skip to content

fix(NoCode): Fix product analytics #2697

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

Merged
shirshanka merged 7 commits into from
Jun 15, 2021
Merged

fix(NoCode): Fix product analytics #2697

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
678f48a
Done
Jun 14, 2021
6428d37
Fix issues
Jun 14, 2021
4e5723e
Formatting changes
Jun 14, 2021
f53cf17
Merge remote-tracking branch 'origin/master' into update-remote-dao
Jun 14, 2021
7f8745d
Done
Jun 15, 2021
7308613
Merge remote-tracking branch 'origin/master' into update-remote-dao
Jun 15, 2021
6b7ecb0
Fix
Jun 15, 2021
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
Prev Previous commit
Next Next commit
Fix issues
  • Loading branch information
Dexter Lee committed Jun 14, 2021
commit 6428d37c807a54b4b7534e3418f1635d1586a303
4 changes: 3 additions & 1 deletion ...rc/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/MappingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ private static Map<String, Object> getMappingsForField(@Nonnull final Searchable
// Add keyword subfield with fielddata set to true for aggregation queries
subFields.put("keyword", ImmutableMap.of("type", "text", "analyzer", "urn_component", "fielddata", true));
}
mappingForField.put("fields", subFields);
if(!subFields.isEmpty()) {
mappingForField.put("fields", subFields);
}
} else if (fieldType == FieldType.BOOLEAN) {
mappingForField.put("type", "boolean");
} else if (fieldType == FieldType.COUNT) {
Expand Down
4 changes: 2 additions & 2 deletions ...ta-utils/src/main/java/com/linkedin/metadata/utils/elasticsearch/IndexConventionImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public IndexConventionImpl(@Nullable String prefix) {
}

private String createIndexName(String baseName) {
return (_prefix.map(prefix -> prefix + "_").orElse("") + baseName + SUFFIX + "_" + VERSION).toLowerCase();
return (_prefix.map(prefix -> prefix + "_").orElse("") + baseName).toLowerCase();
}

@Nonnull
Expand All @@ -35,7 +35,7 @@ public String getIndexName(Class<? extends RecordTemplate> documentClass) {
@Nonnull
@Override
public String getIndexName(EntitySpec entitySpec) {
return this.getIndexName(entitySpec.getName());
return this.getIndexName(entitySpec.getName()) + SUFFIX + "_" + VERSION;
}

@Nonnull
Expand Down