Skip to content

task(OpenSearch) initial Spike Refs: #33956 #34064

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
fabrizzio-dotCMS wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

task(OpenSearch) initial Spike Refs: #33956 #34064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
233f6b1
#33956
fabrizzio-dotCMS Dec 9, 2025
7351161
#33956
fabrizzio-dotCMS Dec 9, 2025
1df3ced
#33956
fabrizzio-dotCMS Dec 12, 2025
dfcbe3a
#33956
fabrizzio-dotCMS Dec 15, 2025
720b312
Merge branch 'main' into issue-33956-OpenSearch-Spike
fabrizzio-dotCMS Dec 15, 2025
8a68ab9
Merge branch 'main' into issue-33956-OpenSearch-Spike
fabrizzio-dotCMS Dec 15, 2025
2903f19
#33956
fabrizzio-dotCMS Dec 17, 2025
5493da0
Merge branch 'issue-33956-OpenSearch-Spike' of https://github.com/dot…
fabrizzio-dotCMS Dec 17, 2025
633491f
#33956
fabrizzio-dotCMS Dec 17, 2025
7f3a74e
#33956
fabrizzio-dotCMS Dec 17, 2025
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
36 changes: 36 additions & 0 deletions bom/application/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<jersey.version>2.28</jersey.version>
<graalvm.version>22.3.3</graalvm.version>
<micrometer.version>1.13.10</micrometer.version>
<opensearch.version>3.3.0</opensearch.version>
</properties>
<dependencyManagement>

Expand Down Expand Up @@ -839,6 +840,41 @@
<version>4.4.6</version>
</dependency>

<!-- OpenSearch 3.x Modern Client -->
<dependency>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-java</artifactId>
<version>${opensearch.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
<version>5.5</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>5.3.4</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-h2</artifactId>
<version>5.3.4</version>
</dependency>

<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
Expand Down
30 changes: 30 additions & 0 deletions dotCMS/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,36 @@
<artifactId>jedis</artifactId>
</dependency>

<dependency>
<groupId>org.opensearch.client</groupId>
<artifactId>opensearch-java</artifactId>
<exclusions>
<exclusion>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5-h2</artifactId>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents.client5</groupId>
<artifactId>httpclient5</artifactId>
</dependency>

<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
Expand Down
19 changes: 9 additions & 10 deletions dotCMS/src/enterprise/java/com/dotcms/enterprise/priv/ESSearchAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@

package com.dotcms.enterprise.priv;

import static com.dotcms.content.elasticsearch.business.ESIndexAPI.INDEX_OPERATIONS_TIMEOUT_IN_MS;

import com.dotcms.content.elasticsearch.business.ESContentFactoryImpl;
import com.dotcms.content.elasticsearch.business.ESSearchResults;
import com.dotcms.content.elasticsearch.business.IndiciesInfo;
import com.dotcms.content.elasticsearch.business.IndicesInfo;
import com.dotcms.content.elasticsearch.util.RestHighLevelClientProvider;
import com.dotcms.enterprise.ESSeachAPI;
import com.dotcms.enterprise.priv.util.SearchSourceBuilderUtil;
Expand All @@ -29,6 +31,10 @@
import com.dotmarketing.util.json.JSONException;
import com.dotmarketing.util.json.JSONObject;
import com.liferay.portal.model.User;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.RequestOptions;
Expand All @@ -37,13 +43,6 @@
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import static com.dotcms.content.elasticsearch.business.ESIndexAPI.INDEX_OPERATIONS_TIMEOUT_IN_MS;

/**
* Implementation class for the {@link ESSeachAPI}.
*
Expand Down Expand Up @@ -200,9 +199,9 @@ private SearchResponse esSearchRaw(JSONObject jsonObject, boolean live, User use
throws DotSecurityException, DotDataException {

String indexToHit;
IndiciesInfo info;
IndicesInfo info;
try {
info = APILocator.getIndiciesAPI().loadIndicies();
info = APILocator.getIndiciesAPI().loadLegacyIndices();
if (live) {
indexToHit = info.getLive();
} else {
Expand Down
32 changes: 16 additions & 16 deletions dotCMS/src/enterprise/java/com/dotcms/enterprise/publishing/sitesearch/ESSiteSearchAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ public class ESSiteSearchAPI implements SiteSearchAPI{

private final ESIndexAPI indexApi;
private final ESMappingAPIImpl mappingAPI;
private final IndiciesAPI indiciesAPI;
private final IndicesAPI indicesAPI;
private ArrayList<Object> list;
private int indexPosition;

@VisibleForTesting
public ESSiteSearchAPI(final ESIndexAPI indexApi,
final ESMappingAPIImpl mappingAPI,
final IndiciesAPI indiciesAPI) {
final IndicesAPI indicesAPI) {
this.indexApi = indexApi;
this.mappingAPI = mappingAPI;
this.indiciesAPI = indiciesAPI;
this.indicesAPI = indicesAPI;
}

public ESSiteSearchAPI() {
Expand Down Expand Up @@ -122,7 +122,7 @@ private void setDefaultToSpecificPosition(final List<String> list, final int ind

try {
//search the default site search index
final String defaultIndice = indiciesAPI.loadIndicies().getSiteSearch();
final String defaultIndice = indicesAPI.loadLegacyIndices().getSiteSearch();
if (defaultIndice != null && !defaultIndice.isEmpty() && !list.isEmpty() ){
final int index = list.indexOf(defaultIndice);
//change the element defaultIndex to the first position of the arraylist if it is not yet
Expand Down Expand Up @@ -170,7 +170,7 @@ public SiteSearchResults search(String query, int start, int rows) throws Elasti
try{


results = search(indiciesAPI.loadIndicies().getSiteSearch(), query, start, rows);
results = search(indicesAPI.loadLegacyIndices().getSiteSearch(), query, start, rows);


}
Expand Down Expand Up @@ -210,7 +210,7 @@ public SiteSearchResults search(String indexName, String query, int offset, int
SearchResponse resp = null;
try {
if(indexName ==null){
indexName = indiciesAPI.loadIndicies().getSiteSearch();
indexName = indicesAPI.loadLegacyIndices().getSiteSearch();
}
if(!IndexType.SITE_SEARCH.is(indexName)){
throw new ElasticsearchException(indexName + " is not a sitesearch index");
Expand Down Expand Up @@ -317,36 +317,36 @@ public SiteSearchResults search(String indexName, String query, int offset, int
*/
@Override
public boolean isDefaultIndex(final String indexName) throws DotDataException {
return indexName.equals(indiciesAPI.loadIndicies().getSiteSearch());
return indexName.equals(indicesAPI.loadLegacyIndices().getSiteSearch());
}

@Override
public void activateIndex(String indexName) throws DotDataException {
if(LicenseUtil.getLevel() < LicenseLevel.STANDARD.level)
return;

final IndiciesInfo info = indiciesAPI.loadIndicies();
final IndiciesInfo.Builder builder = IndiciesInfo.Builder.copy(info);
final IndicesInfo info = indicesAPI.loadLegacyIndices();
final LegacyIndicesInfo.Builder builder = LegacyIndicesInfo.Builder.copy(info);

if(IndexType.SITE_SEARCH.is(indexName)) {
builder.setSiteSearch(indexName);
}

indiciesAPI.point(builder.build());
indicesAPI.point(builder.build());
}

@Override
public void deactivateIndex(String indexName) throws DotDataException, IOException {
if(LicenseUtil.getLevel() < LicenseLevel.STANDARD.level)
return;

final IndiciesInfo info = indiciesAPI.loadIndicies();
final IndiciesInfo.Builder builder = IndiciesInfo.Builder.copy(info);
final IndicesInfo info = indicesAPI.loadLegacyIndices();
final LegacyIndicesInfo.Builder builder = LegacyIndicesInfo.Builder.copy(info);
if(IndexType.SITE_SEARCH.is(indexName)) {
builder.setSiteSearch(null);
}

indiciesAPI.point(builder.build());
indicesAPI.point(builder.build());
}

@Override
Expand Down Expand Up @@ -625,7 +625,7 @@ public Map<String, Aggregation> getAggregations ( String indexName, String query

RestHighLevelClient client = RestHighLevelClientProvider.getInstance().getClient();
if ( indexName == null ) {
indexName = indiciesAPI.loadIndicies().getSiteSearch();
indexName = indicesAPI.loadLegacyIndices().getSiteSearch();
}
if ( !indexApi.indexExists( indexName ) ) {
// try using it as an alias
Expand Down Expand Up @@ -660,7 +660,7 @@ public Map<String, Aggregation> getFacets ( String indexName, String query ) thr

final RestHighLevelClient client = RestHighLevelClientProvider.getInstance().getClient();
if ( indexName == null ) {
indexName = indiciesAPI.loadIndicies().getSiteSearch();
indexName = indicesAPI.loadLegacyIndices().getSiteSearch();
}
if ( !indexApi.indexExists( indexName ) ) {
// try using it as an alias
Expand Down Expand Up @@ -705,7 +705,7 @@ public void deleteOldSiteSearchIndices(){
indicesToRemove.addAll(listIndices());

//Remove Default SiteSearch Index
final IndiciesInfo info = Try.of(()->APILocator.getIndiciesAPI().loadIndicies())
final IndicesInfo info = Try.of(()->APILocator.getIndiciesAPI().loadLegacyIndices())
.getOrNull();

if(info!=null) {
Expand Down
16 changes: 8 additions & 8 deletions dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ContentletIndexAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public interface ContentletIndexAPI {
*/
public void checkAndInitialiazeIndex();

public boolean createContentIndex(String indexName) throws DotIndexException, IOException;
public boolean createContentIndexLegacy(String indexName) throws DotIndexException, IOException;

public boolean createContentIndex(String indexName, int shards) throws DotIndexException, IOException;
public boolean createContentIndexLegacy(String indexName, int shards) throws DotIndexException, IOException;

/**
* creates new working and live indexes with reading aliases pointing to old index and write aliases
Expand Down Expand Up @@ -130,13 +130,13 @@ public void removeContentFromIndexByContentType(final ContentType contentType)

void addContentToIndex(Contentlet content, boolean deps) throws DotDataException;

BulkRequest createBulkRequest(List<Contentlet> contentToIndex) throws DotDataException;
BulkRequest createBulkRequestLegacy(List<Contentlet> contentToIndex) throws DotDataException;

BulkRequest createBulkRequest();
BulkRequest createBulkRequestLegacy();

BulkRequest appendBulkRequest(BulkRequest bulkRequest, Collection<ReindexEntry> idxs) throws DotDataException;
BulkRequest appendBulkRequestLegacy(BulkRequest bulkRequest, Collection<ReindexEntry> idxs) throws DotDataException;

BulkRequest appendBulkRequest(BulkRequest bulkRequest, ReindexEntry idx) throws DotDataException;
BulkRequest appendBulkRequestLegacy(BulkRequest bulkRequest, ReindexEntry idx) throws DotDataException;

Optional<String> reindexTimeElapsed();

Expand All @@ -148,7 +148,7 @@ public void removeContentFromIndexByContentType(final ContentType contentType)

BulkRequest appendBulkRemoveRequest(BulkRequest bulkRequest, final ReindexEntry entry) throws DotDataException;

BulkProcessor createBulkProcessor(BulkProcessorListener bulkListener);
BulkProcessor createBulkProcessorLegacy(BulkProcessorListener bulkListener);

void appendToBulkProcessor(final BulkProcessor bulk, final Collection<ReindexEntry> idxs) throws DotDataException;
void appendToBulkProcessorLegacy(final BulkProcessor bulk, final Collection<ReindexEntry> idxs) throws DotDataException;
}
Loading
Loading