mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-03-25 09:28:27 +00:00
Upgrade lucene to 8.4.0-snapshot-e648d601efb (#49641)
This commit is contained in:
Mayya Sharipova
GitHub
parent
d5842aebab
commit
2dafecc398
@ -1,5 +1,5 @@
|
||||
elasticsearch = 7.6.0
|
||||
lucene = 8.3.0-snapshot-25968e3b75e
|
||||
lucene = 8.4.0-snapshot-e648d601efb
|
||||
|
||||
bundled_jdk_vendor = adoptopenjdk
|
||||
bundled_jdk = 13.0.1+9
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
|
||||
include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]
|
||||
|
||||
:lucene_version: 8.3.0
|
||||
:lucene_version_path: 8_3_0
|
||||
:lucene_version: 8.4.0
|
||||
:lucene_version_path: 8_4_0
|
||||
:jdk: 1.8.0_131
|
||||
:jdk_major: 8
|
||||
:build_flavor: default
|
||||
|
||||
@ -1 +0,0 @@
|
||||
738a12e76b5c60f2a714fc3e6611c8ae6dc63159
|
||||
@ -0,0 +1 @@
|
||||
43b9178f582373f4fcee61837404c0cc8636043e
|
||||
@ -1 +0,0 @@
|
||||
6313d19a4f40d54ad12e20a66666049f88bac0ff
|
||||
@ -0,0 +1 @@
|
||||
8ee342fa6e6306e56b583251639a661250fada46
|
||||
@ -1 +0,0 @@
|
||||
a28b8590a4f9ae219241a34382a39fe2f205f2e2
|
||||
@ -0,0 +1 @@
|
||||
7e31f2a38d1434eb50781efc65b0e028f08d7821
|
||||
@ -1 +0,0 @@
|
||||
c088334a34e477b122d8fa8623fb3b8f6a0a46e4
|
||||
@ -0,0 +1 @@
|
||||
9079d81a8ea2c7190ef09ca06a987d1cab2fdf17
|
||||
@ -1 +0,0 @@
|
||||
c36d794f4f1758e6e7fab457c3a6d41b45690484
|
||||
@ -0,0 +1 @@
|
||||
f253f59d4e8bb6e55eb307b011ddb81ba0ebab92
|
||||
@ -1 +0,0 @@
|
||||
8707a4fae440930f198a05083435466b605aa42f
|
||||
@ -0,0 +1 @@
|
||||
36547378493e6e84f63dc744df8d414cb2add1a4
|
||||
@ -1 +0,0 @@
|
||||
49f9c34735dfc9bfc182ca56a7271350d1944040
|
||||
@ -0,0 +1 @@
|
||||
8b15a376efa7d4289b697144f34a819a9f8772f1
|
||||
@ -1 +0,0 @@
|
||||
f1e4bb9faba619705f0b5753db65ce51f2156712
|
||||
@ -0,0 +1 @@
|
||||
d1bc4170e6981ca9af71d7a4ce46a3feb2f7b613
|
||||
@ -1 +0,0 @@
|
||||
9ceeaa74e15fd21435331bd5be3176f61972cdc2
|
||||
@ -0,0 +1 @@
|
||||
1cb225781b19e758d216987e363b77fa4b041174
|
||||
@ -1 +0,0 @@
|
||||
43eaefd258e3cc9b1261679f18421d264d8f40a1
|
||||
@ -0,0 +1 @@
|
||||
cbbf849e24ef0cc61312579acf6d6c5b72c99cf5
|
||||
@ -1 +0,0 @@
|
||||
d84d93bf46fb105864fa5d54c08fd63ca2650d56
|
||||
@ -0,0 +1 @@
|
||||
aa74590851b6fcf536976f75448be52f6ca18a4a
|
||||
@ -1 +0,0 @@
|
||||
aa4a4b7b27591003e290a2eb02b61cfc52147b4c
|
||||
@ -0,0 +1 @@
|
||||
1bd113010c183168d79fbc10a6b590fdacc3fa35
|
||||
@ -1 +0,0 @@
|
||||
7a4f796d2f8617d805f9f84623e7497085dda0d4
|
||||
@ -0,0 +1 @@
|
||||
4e44a435e14d12113ca9193182a302677fda155e
|
||||
@ -1 +0,0 @@
|
||||
ffd05f24dd7749b08809dfc2ad3a93c0845c5f84
|
||||
@ -0,0 +1 @@
|
||||
eb8eacd015ef81ef2055ada357a92c9751308ef1
|
||||
@ -1 +0,0 @@
|
||||
fb576d36ebf966c48fb58765c6bd7b6e5320cbd6
|
||||
@ -0,0 +1 @@
|
||||
4dc565203bb1eab0222c52215891e207e7032209
|
||||
@ -1 +0,0 @@
|
||||
b052ad9ac2ad9d81d1b80e48ec47985644d36f3f
|
||||
@ -0,0 +1 @@
|
||||
ef596e6d2a7ac9c7dfc6196dad75dc719c81ce85
|
||||
@ -1 +0,0 @@
|
||||
8edf59c2cd920a1cd926573620b8b0f82fe03f2a
|
||||
@ -0,0 +1 @@
|
||||
b0c963e68dd71444f09336258c8f63425514426a
|
||||
@ -1 +0,0 @@
|
||||
d070d33ddf37bf45a0656dec980a69ac930c8218
|
||||
@ -0,0 +1 @@
|
||||
bfab3e9b0467662a8ff969da215dc4a999b73076
|
||||
@ -1 +0,0 @@
|
||||
5ea387ae19df210c5b6e75eb38bf589dc39e54f4
|
||||
@ -0,0 +1 @@
|
||||
dadfc90e4cd032f8a4db5cc1e0bdddecea635edb
|
||||
@ -1 +0,0 @@
|
||||
395ddd7e7774ad9027269222d746d30651ab8cf3
|
||||
@ -0,0 +1 @@
|
||||
e72dd79d30781e4d05bc8397ae61d0b51d7ad522
|
||||
@ -1 +0,0 @@
|
||||
85da517bdc0b200b040c0293eea0ff6f36082e31
|
||||
@ -0,0 +1 @@
|
||||
e6b6dbd0526287f25d98d7fe354d5e290c875b8a
|
||||
@ -1 +0,0 @@
|
||||
ccf4b384c0051d9bd1df73a0a5f62c7064039db6
|
||||
@ -0,0 +1 @@
|
||||
6351edfc6dde2aefd8f6d8ef33ae5a6e08f88321
|
||||
@ -1 +0,0 @@
|
||||
9bf83a2a79cf6c392961c06b3afaa3d3871274da
|
||||
@ -0,0 +1 @@
|
||||
921dd4ab493b9d70a0b1bf7b0fe8a6790b7e8036
|
||||
@ -125,7 +125,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
|
||||
public static final Version V_7_4_2 = new Version(7040299, org.apache.lucene.util.Version.LUCENE_8_2_0);
|
||||
public static final Version V_7_4_3 = new Version(7040399, org.apache.lucene.util.Version.LUCENE_8_2_0);
|
||||
public static final Version V_7_5_0 = new Version(7050099, org.apache.lucene.util.Version.LUCENE_8_3_0);
|
||||
public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_3_0);
|
||||
public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_4_0);
|
||||
public static final Version CURRENT = V_7_6_0;
|
||||
|
||||
private static final ImmutableOpenIntMap<Version> idToVersion;
|
||||
|
||||
@ -27,6 +27,7 @@ import org.elasticsearch.common.Strings;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||
import org.elasticsearch.index.IndexModule;
|
||||
import org.elasticsearch.index.engine.CommitStats;
|
||||
import org.elasticsearch.index.engine.SegmentsStats;
|
||||
import org.elasticsearch.index.translog.Translog;
|
||||
@ -55,6 +56,7 @@ public class IndicesStatsTests extends ESSingleNodeTestCase {
|
||||
}
|
||||
|
||||
public void testSegmentStats() throws Exception {
|
||||
IndexModule.Type storeType = IndexModule.defaultStoreType(true);
|
||||
XContentBuilder mapping = XContentFactory.jsonBuilder()
|
||||
.startObject()
|
||||
.startObject("doc")
|
||||
@ -74,7 +76,8 @@ public class IndicesStatsTests extends ESSingleNodeTestCase {
|
||||
.endObject()
|
||||
.endObject()
|
||||
.endObject();
|
||||
assertAcked(client().admin().indices().prepareCreate("test").addMapping("doc", mapping));
|
||||
assertAcked(client().admin().indices().prepareCreate("test").addMapping("doc", mapping)
|
||||
.setSettings(Settings.builder().put("index.store.type", storeType.getSettingsKey())));
|
||||
ensureGreen("test");
|
||||
client().prepareIndex("test", "doc", "1").setSource("foo", "bar", "bar", "baz", "baz", 42).get();
|
||||
client().admin().indices().prepareRefresh("test").get();
|
||||
@ -85,8 +88,12 @@ public class IndicesStatsTests extends ESSingleNodeTestCase {
|
||||
assertThat(stats.getStoredFieldsMemoryInBytes(), greaterThan(0L));
|
||||
assertThat(stats.getTermVectorsMemoryInBytes(), greaterThan(0L));
|
||||
assertThat(stats.getNormsMemoryInBytes(), greaterThan(0L));
|
||||
assertThat(stats.getPointsMemoryInBytes(), greaterThan(0L));
|
||||
assertThat(stats.getDocValuesMemoryInBytes(), greaterThan(0L));
|
||||
if ((storeType == IndexModule.Type.MMAPFS) || (storeType == IndexModule.Type.HYBRIDFS)) {
|
||||
assertEquals(0, stats.getPointsMemoryInBytes()); // bkd tree is stored off-heap
|
||||
} else {
|
||||
assertThat(stats.getPointsMemoryInBytes(), greaterThan(0L)); // bkd tree is stored on heap
|
||||
}
|
||||
|
||||
// now check multiple segments stats are merged together
|
||||
client().prepareIndex("test", "doc", "2").setSource("foo", "bar", "bar", "baz", "baz", 43).get();
|
||||
@ -98,8 +105,12 @@ public class IndicesStatsTests extends ESSingleNodeTestCase {
|
||||
assertThat(stats2.getStoredFieldsMemoryInBytes(), greaterThan(stats.getStoredFieldsMemoryInBytes()));
|
||||
assertThat(stats2.getTermVectorsMemoryInBytes(), greaterThan(stats.getTermVectorsMemoryInBytes()));
|
||||
assertThat(stats2.getNormsMemoryInBytes(), greaterThan(stats.getNormsMemoryInBytes()));
|
||||
assertThat(stats2.getPointsMemoryInBytes(), greaterThan(stats.getPointsMemoryInBytes()));
|
||||
assertThat(stats2.getDocValuesMemoryInBytes(), greaterThan(stats.getDocValuesMemoryInBytes()));
|
||||
if ((storeType == IndexModule.Type.MMAPFS) || (storeType == IndexModule.Type.HYBRIDFS)) {
|
||||
assertEquals(0, stats2.getPointsMemoryInBytes()); // bkd tree is stored off-heap
|
||||
} else {
|
||||
assertThat(stats2.getPointsMemoryInBytes(), greaterThan(stats.getPointsMemoryInBytes())); // bkd tree is stored on heap
|
||||
}
|
||||
}
|
||||
|
||||
public void testCommitStats() throws Exception {
|
||||
|
||||
@ -1 +0,0 @@
|
||||
d84d93bf46fb105864fa5d54c08fd63ca2650d56
|
||||
@ -0,0 +1 @@
|
||||
aa74590851b6fcf536976f75448be52f6ca18a4a
|
||||
Loading…
x
Reference in New Issue
Block a user