Skip to content

Commit 6099c70

Browse files
committed
Activate Detect Breaking Changes Github Action since we have 3.0.0 baseline
Signed-off-by: Andriy Redko <[email protected]>
1 parent 7d2b8cc commit 6099c70

File tree

10 files changed

+42
-9
lines changed

10 files changed

+42
-9
lines changed

.github/workflows/detect-breaking-change.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: "Detect Breaking Changes"
22
on:
3-
pull_request:
4-
branches-ignore:
5-
- main # This branch represents a to-be-released version of OpenSearch where breaking changes are allowed
6-
- '3.0' # We must establish a baseline 3.0 release version before adding enforcement
3+
pull_request
74

85
jobs:
96
detect-breaking-change:
@@ -18,7 +15,7 @@ jobs:
1815
with:
1916
cache-disabled: true
2017
arguments: japicmp
21-
gradle-version: 8.11
18+
gradle-version: 8.14
2219
build-root-directory: server
2320
- if: failure()
2421
run: cat server/build/reports/java-compatibility/report.txt

server/build.gradle

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ tasks.named("sourcesJar").configure {
395395
tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
396396
logger.info("Comparing public APIs from ${version} to ${japicmpCompareTarget}")
397397
// See please https://github.com/siom79/japicmp/issues/201
398-
compatibilityChangeExcludes = [ "METHOD_ABSTRACT_NOW_DEFAULT" ]
398+
compatibilityChangeExcludes = [ "METHOD_ABSTRACT_NOW_DEFAULT", "METHOD_ADDED_TO_INTERFACE" ]
399399
oldClasspath.from(files("${buildDir}/japicmp-target/opensearch-${japicmpCompareTarget}.jar"))
400400
newClasspath.from(tasks.named('jar'))
401401
onlyModified = true
@@ -404,6 +404,21 @@ tasks.register("japicmp", me.champeau.gradle.japicmp.JapicmpTask) {
404404
failOnSourceIncompatibility = true
405405
annotationIncludes = ['@org.opensearch.common.annotation.PublicApi', '@org.opensearch.common.annotation.DeprecatedApi']
406406
annotationExcludes = ['@org.opensearch.common.annotation.InternalApi']
407+
// Already broken APIs, excluding them for now
408+
classExcludes = [
409+
"org.opensearch.action.DocWriteRequest",
410+
"org.opensearch.cluster.ClusterInfo",
411+
"org.opensearch.cluster.service.PendingClusterTask",
412+
"org.opensearch.index.IndexService",
413+
"org.opensearch.indices.IndicesService",
414+
"org.opensearch.index.IndexModule",
415+
"org.opensearch.index.store.remote.filecache.FileCacheStats",
416+
"org.opensearch.index.store.remote.filecache.FileCache",
417+
"org.opensearch.index.store.remote.utils.cache.CacheUsage",
418+
"org.opensearch.index.store.remote.utils.cache.stats.CacheStats",
419+
"org.opensearch.index.query.QueryCoordinatorContext",
420+
"org.opensearch.index.shard.IndexShard"
421+
]
407422
txtOutputFile = layout.buildDirectory.file("reports/java-compatibility/report.txt")
408423
htmlOutputFile = layout.buildDirectory.file("reports/java-compatibility/report.html")
409424
dependsOn downloadJapicmpCompareTarget

server/src/main/java/org/opensearch/cluster/service/PendingClusterTask.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
import org.opensearch.Version;
3636
import org.opensearch.common.Priority;
37+
import org.opensearch.common.annotation.InternalApi;
3738
import org.opensearch.common.annotation.PublicApi;
3839
import org.opensearch.common.unit.TimeValue;
3940
import org.opensearch.core.common.io.stream.StreamInput;
@@ -58,6 +59,7 @@ public class PendingClusterTask implements Writeable {
5859
private boolean executing;
5960
private long timeInExecution;
6061

62+
@InternalApi
6163
public PendingClusterTask(StreamInput in) throws IOException {
6264
insertOrder = in.readVLong();
6365
priority = Priority.readFrom(in);
@@ -69,6 +71,7 @@ public PendingClusterTask(StreamInput in) throws IOException {
6971
}
7072
}
7173

74+
@InternalApi
7275
public PendingClusterTask(long insertOrder, Priority priority, Text source, long timeInQueue, boolean executing, long timeInExecution) {
7376
assert timeInQueue >= 0 : "got a negative timeInQueue [" + timeInQueue + "]";
7477
assert insertOrder >= 0 : "got a negative insertOrder [" + insertOrder + "]";

server/src/main/java/org/opensearch/index/IndexModule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.opensearch.common.SetOnce;
4848
import org.opensearch.common.TriFunction;
4949
import org.opensearch.common.annotation.ExperimentalApi;
50+
import org.opensearch.common.annotation.InternalApi;
5051
import org.opensearch.common.annotation.PublicApi;
5152
import org.opensearch.common.logging.DeprecationLogger;
5253
import org.opensearch.common.settings.Setting;
@@ -271,6 +272,7 @@ public final class IndexModule {
271272
* @param engineFactory the engine factory
272273
* @param directoryFactories the available store types
273274
*/
275+
@InternalApi
274276
public IndexModule(
275277
final IndexSettings indexSettings,
276278
final AnalysisRegistry analysisRegistry,
@@ -299,6 +301,7 @@ public IndexModule(
299301
this.compositeIndexSettings = compositeIndexSettings;
300302
}
301303

304+
@InternalApi
302305
public IndexModule(
303306
final IndexSettings indexSettings,
304307
final AnalysisRegistry analysisRegistry,

server/src/main/java/org/opensearch/index/IndexService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.opensearch.cluster.service.ClusterService;
4949
import org.opensearch.common.CheckedFunction;
5050
import org.opensearch.common.Nullable;
51+
import org.opensearch.common.annotation.InternalApi;
5152
import org.opensearch.common.annotation.PublicApi;
5253
import org.opensearch.common.settings.Setting;
5354
import org.opensearch.common.settings.Setting.Property;
@@ -203,6 +204,7 @@ public class IndexService extends AbstractIndexComponent implements IndicesClust
203204
private volatile TimeValue refreshInterval;
204205
private volatile boolean shardLevelRefreshEnabled;
205206

207+
@InternalApi
206208
public IndexService(
207209
IndexSettings indexSettings,
208210
IndexCreationContext indexCreationContext,
@@ -344,6 +346,7 @@ public IndexService(
344346
}
345347
}
346348

349+
@InternalApi
347350
public IndexService(
348351
IndexSettings indexSettings,
349352
IndexCreationContext indexCreationContext,

server/src/main/java/org/opensearch/index/query/QueryCoordinatorContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
package org.opensearch.index.query;
1010

1111
import org.opensearch.action.IndicesRequest;
12+
import org.opensearch.common.annotation.InternalApi;
1213
import org.opensearch.common.annotation.PublicApi;
1314
import org.opensearch.core.action.ActionListener;
1415
import org.opensearch.core.common.io.stream.NamedWriteableRegistry;
@@ -35,6 +36,7 @@ public class QueryCoordinatorContext implements QueryRewriteContext {
3536
private final QueryRewriteContext rewriteContext;
3637
private final IndicesRequest searchRequest;
3738

39+
@InternalApi
3840
public QueryCoordinatorContext(QueryRewriteContext rewriteContext, IndicesRequest searchRequest) {
3941
this.rewriteContext = rewriteContext;
4042
this.searchRequest = searchRequest;

server/src/main/java/org/opensearch/index/shard/IndexShard.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import org.opensearch.common.Nullable;
8484
import org.opensearch.common.SetOnce;
8585
import org.opensearch.common.annotation.ExperimentalApi;
86+
import org.opensearch.common.annotation.InternalApi;
8687
import org.opensearch.common.annotation.PublicApi;
8788
import org.opensearch.common.collect.Tuple;
8889
import org.opensearch.common.concurrent.GatedCloseable;
@@ -379,6 +380,7 @@ Runnable getGlobalCheckpointSyncer() {
379380
private volatile AsyncShardRefreshTask refreshTask;
380381
private final ClusterApplierService clusterApplierService;
381382

383+
@InternalApi
382384
public IndexShard(
383385
final ShardRouting shardRouting,
384386
final IndexSettings indexSettings,

server/src/main/java/org/opensearch/index/store/remote/filecache/FileCacheStats.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
package org.opensearch.index.store.remote.filecache;
1010

11-
import org.opensearch.common.annotation.ExperimentalApi;
11+
import org.opensearch.common.annotation.InternalApi;
12+
import org.opensearch.common.annotation.PublicApi;
1213
import org.opensearch.core.common.io.stream.StreamInput;
1314
import org.opensearch.core.common.io.stream.StreamOutput;
1415
import org.opensearch.core.common.io.stream.Writeable;
@@ -32,7 +33,7 @@
3233
*
3334
* @opensearch.api
3435
*/
35-
@ExperimentalApi
36+
@PublicApi(since = "2.7.0")
3637
public class FileCacheStats implements Writeable, ToXContentFragment {
3738

3839
private final long active;
@@ -44,6 +45,7 @@ public class FileCacheStats implements Writeable, ToXContentFragment {
4445
private final long misses;
4546
private final FileCacheStatsType statsType;
4647

48+
@InternalApi
4749
public FileCacheStats(
4850
final long active,
4951
long total,
@@ -64,6 +66,7 @@ public FileCacheStats(
6466
this.statsType = statsType;
6567
}
6668

69+
@InternalApi
6770
public FileCacheStats(final StreamInput in) throws IOException {
6871
this.statsType = FileCacheStatsType.fromString(in.readString());
6972
this.active = in.readLong();

server/src/main/java/org/opensearch/indices/IndicesService.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
import org.opensearch.common.CheckedFunction;
6262
import org.opensearch.common.CheckedSupplier;
6363
import org.opensearch.common.Nullable;
64+
import org.opensearch.common.annotation.InternalApi;
6465
import org.opensearch.common.annotation.PublicApi;
6566
import org.opensearch.common.cache.policy.CachedQueryResult;
6667
import org.opensearch.common.cache.service.CacheService;
@@ -420,6 +421,7 @@ protected void doStart() {
420421
threadPool.schedule(this.cacheCleaner, this.cleanInterval, ThreadPool.Names.SAME);
421422
}
422423

424+
@InternalApi
423425
public IndicesService(
424426
Settings settings,
425427
PluginsService pluginsService,
@@ -587,6 +589,7 @@ protected void closeInternal() {
587589
.addSettingsUpdateConsumer(CLUSTER_DEFAULT_INDEX_MAX_MERGE_AT_ONCE_SETTING, this::onDefaultMaxMergeAtOnceUpdate);
588590
}
589591

592+
@InternalApi
590593
public IndicesService(
591594
Settings settings,
592595
PluginsService pluginsService,

server/src/main/java/org/opensearch/search/internal/SearchContext.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,9 @@ public String toString() {
519519

520520
public abstract boolean shouldUseTimeSeriesDescSortOptimization();
521521

522-
public abstract boolean getStarTreeIndexEnabled();
522+
public boolean getStarTreeIndexEnabled() {
523+
return false;
524+
}
523525

524526
public int maxAggRewriteFilters() {
525527
return 0;

0 commit comments

Comments
 (0)