Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
980723e
poc
n1v0lg Jun 24, 2025
4ff5e6e
poc
n1v0lg Jun 24, 2025
3df7a1d
Fix ups
n1v0lg Jun 26, 2025
c21a0a9
The missing commit
n1v0lg Jun 26, 2025
5266376
Merge branch 'main' into poc-flat-world
n1v0lg Jul 9, 2025
650dd77
Merge branch 'main' into poc-flat-world
n1v0lg Jul 10, 2025
9d63d77
More
n1v0lg Jul 10, 2025
8eec08e
Moar
n1v0lg Jul 10, 2025
fe6b696
Also resolver
n1v0lg Jul 10, 2025
8dee748
field caps
n1v0lg Jul 10, 2025
f9d6407
Merge branch 'main' into poc-flat-world
n1v0lg Jul 11, 2025
be2ab99
SPI
n1v0lg Jul 11, 2025
710d789
SPI
n1v0lg Jul 11, 2025
3587e6a
Remote conns
n1v0lg Jul 11, 2025
26a49c0
More
n1v0lg Jul 12, 2025
2a45f5b
Extract interface
n1v0lg Jul 12, 2025
9d29d4f
Inject authenticator
n1v0lg Jul 13, 2025
0ef2258
Simplify
n1v0lg Jul 13, 2025
88104ce
Scope
n1v0lg Jul 13, 2025
035ffc1
Compile
n1v0lg Jul 14, 2025
f5cad57
Merge branch 'main' into poc-cps-e2e
n1v0lg Jul 14, 2025
fe3dea0
Query routing
n1v0lg Jul 14, 2025
1153dfa
Some clean up
n1v0lg Jul 14, 2025
3fd532e
WIP esql
n1v0lg Jul 15, 2025
512222e
Fix interface
n1v0lg Jul 15, 2025
b867e69
WIP resolver
n1v0lg Jul 15, 2025
08d3e4e
Only inject resolver
n1v0lg Jul 15, 2025
d36c3f6
Clean up
n1v0lg Jul 15, 2025
d20a8c9
esql patch by @idegtiarenko
n1v0lg Jul 16, 2025
32ed394
More context
n1v0lg Jul 17, 2025
67f5cdf
More still
n1v0lg Jul 17, 2025
e25d8b2
CrossProjectAware
n1v0lg Jul 17, 2025
137195f
Javadoc
n1v0lg Jul 17, 2025
ee93568
Merge and clean up
n1v0lg Aug 18, 2025
18d6bcb
More
n1v0lg Aug 19, 2025
2ae90af
Local index resolution
n1v0lg Aug 19, 2025
2b092fb
WIP
n1v0lg Aug 20, 2025
d834784
More
n1v0lg Aug 22, 2025
7de6de0
More
n1v0lg Aug 22, 2025
9e53cc3
WIP e2e error handling
n1v0lg Aug 22, 2025
2d8a118
Flat world maybe
n1v0lg Aug 25, 2025
01ad89b
Merge branch 'main' into poc-cps-e2e
n1v0lg Aug 25, 2025
4cc41c3
Small clean up
n1v0lg Aug 25, 2025
254977c
TODO
n1v0lg Aug 25, 2025
e427303
A v big refactor
n1v0lg Aug 27, 2025
efbd82e
V confusing double resolution fix
n1v0lg Aug 27, 2025
d8103f9
Ominous TODO
n1v0lg Aug 27, 2025
1d3dc40
Nits
n1v0lg Aug 27, 2025
c03c73a
Tweaks
n1v0lg Aug 28, 2025
1f04a53
[CI] Auto commit changes from spotless
Aug 28, 2025
9f341be
Merge
n1v0lg Aug 28, 2025
7c6b1fc
Consolidate more index resolution
n1v0lg Aug 28, 2025
91bf747
Missing
n1v0lg Aug 28, 2025
266a822
fix
n1v0lg Aug 28, 2025
bf307e2
Undo
n1v0lg Aug 28, 2025
768affc
More
n1v0lg Aug 28, 2025
d1bd040
Merge
n1v0lg Aug 28, 2025
a78010b
TODO
n1v0lg Aug 28, 2025
ca5b153
Project routing
n1v0lg Aug 28, 2025
aaab227
More abstractions
n1v0lg Aug 29, 2025
1967bfa
Fixes
n1v0lg Aug 29, 2025
700af92
More
n1v0lg Aug 29, 2025
652caf3
Merge branch 'main' into poc-cps-e2e
n1v0lg Aug 29, 2025
3a8c4dc
Renames
n1v0lg Aug 29, 2025
24b9f7c
Clean up
n1v0lg Aug 31, 2025
804069c
More clean up
n1v0lg Sep 1, 2025
a61ad84
Also xpack
n1v0lg Sep 1, 2025
ab675dc
Merge branch 'main' into poc-cps-e2e
n1v0lg Sep 1, 2025
b11d30a
Checkstyle
n1v0lg Sep 1, 2025
cd6511f
Nits
n1v0lg Sep 2, 2025
da74cb5
Rename
n1v0lg Sep 3, 2025
5373143
Merge
n1v0lg Sep 3, 2025
6544589
Cut down on number of classes
n1v0lg Sep 3, 2025
7b7aa7d
More
n1v0lg Sep 3, 2025
2af9134
Clean up
n1v0lg Sep 4, 2025
c17b5c5
More
n1v0lg Sep 4, 2025
7d9a438
Tweaks
n1v0lg Sep 8, 2025
80bd89e
Nits
n1v0lg Sep 9, 2025
0a4046c
Fix compl
n1v0lg Sep 9, 2025
49814b1
Merge branch 'main' into poc-cps-e2e
n1v0lg Sep 12, 2025
01276d5
Revert "Merge branch 'main' into poc-cps-e2e"
n1v0lg Sep 12, 2025
d1bb772
CPS service and fix refactor
n1v0lg Sep 12, 2025
d5af5bc
Index resolution
n1v0lg Sep 12, 2025
f380e82
xpack
n1v0lg Sep 12, 2025
fd1df71
Persist headers
n1v0lg Sep 12, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions .buildkite/pipelines/java-ea-check-new-build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .buildkite/pipelines/periodic-fwc.template.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
steps:
- label: "{{matrix.FWC_VERSION}} / fwc"
- label: "{{matrix.FWC_VERSION}}" / fwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
timeout_in_minutes: 300
agents:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/pipelines/periodic-fwc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is auto-generated. See .buildkite/pipelines/periodic-fwc.template.yml
steps:
- label: "{{matrix.FWC_VERSION}} / fwc"
- label: "{{matrix.FWC_VERSION}}" / fwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v$$FWC_VERSION#fwcTest -Dtests.bwc.snapshot=false
timeout_in_minutes: 300
agents:
Expand Down
1 change: 0 additions & 1 deletion .buildkite/pipelines/pull-request-transport-versions.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .buildkite/pipelines/pull-request/pr-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ steps:
- label: pr-upgrade
command: ".buildkite/scripts/run-pr-upgrade-tests.sh"
agents:
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.15"
image: "docker.elastic.co/ci-agent-images/eck-region/buildkite-agent:1.5"
memory: "4G"
19 changes: 0 additions & 19 deletions .buildkite/pull-requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,6 @@
"cancel_intermediate_builds": true,
"cancel_intermediate_builds_on_comment": false
},
{
"enabled": true,
"target_branch": "main",
"pipeline_slug": "elasticsearch-pull-request-transport-versions",
"allow_org_users": true,
"allowed_repo_permissions": [
"admin",
"write"
],
"allowed_list": ["elastic-renovate-prod[bot]"],
"set_commit_status": false,
"build_on_commit": true,
"build_on_comment": true,
"trigger_comment_regex": "(run\\W+elasticsearch-ci.+)|(^\\s*((buildkite|@elastic(search)?machine)\\s*)?test\\s+this(\\s+please)?)",
"retrigger_label_regex": "v[0-9]+\\.[0-9]+\\.[0-9]+",
"cancel_intermediate_builds": true,
"cancel_intermediate_builds_on_comment": false,
"skip_duplicate_builds": true
},
{
"enabled": true,
"pipeline_slug": "elasticsearch-pull-request-performance-benchmark",
Expand Down
95 changes: 0 additions & 95 deletions .buildkite/scripts/trigger-if-java-ea-new-build.sh

This file was deleted.

15 changes: 6 additions & 9 deletions TESTING.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -681,15 +681,12 @@ There are multiple base classes for tests:
directly by unit tests.
* **`ESSingleNodeTestCase`**: This test case sets up a cluster that has a
single node.
* **`ESIntegTestCase`**: An internal integration test that starts nodes within the same JVM as the test.
These allow you to test functionality that is not exposed via the REST API, or for verifying a certain internal state.
Additionally, you can easily simulate tricky distributed setups that are difficult to do in REST tests.
If you only need to start one node, use `ESSingleNodeTestCase` instead, which is a much lighter test setup.
* **`ESRestTestCase`**: An integration test that interacts with an external
cluster via the REST API. This is used for Java based REST tests. This should
be the first choice for writing integration tests as these tests run in a much more
realistic setup.
* **`ESClientYamlSuiteTestCase` **: A subclass of `ESRestTestCase` used to run YAML based REST tests.
* **`ESIntegTestCase`**: An integration test case that creates a cluster that
might have multiple nodes.
* **`ESRestTestCase`**: An integration tests that interacts with an external
cluster via the REST API. This is used for Java based REST tests.
* **`ESClientYamlSuiteTestCase` **: A subclass of `ESRestTestCase` used to run
YAML based REST tests.

=== Good practices

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class OptimizedScalarQuantizerBenchmark {
int dims;

float[] vector;
float[] scratch;
float[] centroid;
int[] destination;

Expand All @@ -58,7 +57,6 @@ public void init() {
destination = new int[dims];
vector = new float[dims];
centroid = new float[dims];
scratch = new float[dims];
for (int i = 0; i < dims; ++i) {
vector[i] = random.nextFloat();
centroid[i] = random.nextFloat();
Expand All @@ -67,14 +65,14 @@ public void init() {

@Benchmark
public int[] scalar() {
osq.scalarQuantize(vector, scratch, destination, bits, centroid);
osq.scalarQuantize(vector, destination, bits, centroid);
return destination;
}

@Benchmark
@Fork(jvmArgsPrepend = { "--add-modules=jdk.incubator.vector" })
public int[] vector() {
osq.scalarQuantize(vector, scratch, destination, bits, centroid);
osq.scalarQuantize(vector, destination, bits, centroid);
return destination;
}
}
2 changes: 1 addition & 1 deletion build-conventions/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

plugins {
id "com.gradle.develocity" version "4.1.1"
id "com.gradle.develocity" version "4.0.1"
}

rootProject.name = 'build-conventions'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.Properties;
import javax.inject.Inject;

public abstract class VersionPropertiesBuildService implements BuildService<VersionPropertiesBuildService.Params>, AutoCloseable {
abstract class VersionPropertiesBuildService implements BuildService<VersionPropertiesBuildService.Params>, AutoCloseable {

private final Properties properties;

Expand Down
2 changes: 1 addition & 1 deletion build-tools-internal/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pluginManagement {
}

plugins {
id "com.gradle.develocity" version "4.1.1"
id "com.gradle.develocity" version "4.0.1"
}

dependencyResolutionManagement {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,65 +108,4 @@ class ElasticsearchTestBasePluginFuncTest extends AbstractGradleFuncTest {
then:
result.task(':test').outcome == TaskOutcome.UP_TO_DATE
}

def "uses new test seed for every invocation"() {
given:
file("src/test/java/acme/SomeTests.java").text = """

public class SomeTests {
@org.junit.Test
public void printTestSeed() {
System.out.println("TESTSEED=[" + System.getProperty("tests.seed") + "]");
}
}

"""
buildFile.text = """
plugins {
id 'java'
id 'elasticsearch.test-base'
}

tasks.named('test').configure {
testLogging {
showStandardStreams = true
}
}

tasks.register('test2', Test) {
classpath = sourceSets.test.runtimeClasspath
testClassesDirs = sourceSets.test.output.classesDirs
testLogging {
showStandardStreams = true
}
}

repositories {
mavenCentral()
}

dependencies {
testImplementation 'junit:junit:4.12'
}

"""

when:
def result1 = gradleRunner("cleanTest", "cleanTest2", "test", "test2").build()
def result2 = gradleRunner("cleanTest", "cleanTest2", "test", "test2").build()

then:
def seeds1 = result1.output.findAll(/(?m)TESTSEED=\[([^\]]+)\]/) { it[1] }
def seeds2 = result2.output.findAll(/(?m)TESTSEED=\[([^\]]+)\]/) { it[1] }

seeds1.unique().size() == 1
seeds2.unique().size() == 1

verifyAll {
seeds1[0] != null
seeds2[0] != null
seeds1[0] != seeds2[0]
}
result2.output.contains("Configuration cache entry reused.")
}
}
Loading
Loading