summaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-09-28 12:30:23 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2022-09-28 12:32:01 +0200
commit7e0317e81ff5d08f905077d0525a6bc30bb17496 (patch)
tree80031f2dbc321b457ddadb312b4a9d31f0275f97 /config-model/src/test
parentceae7c63e4ab5b8ec5badb188a43c08eb321e829 (diff)
GC unused enable-bitvector flag
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java13
-rw-r--r--config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java6
2 files changed, 9 insertions, 10 deletions
diff --git a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
index 54fb6b0fb52..eb9daf02aad 100644
--- a/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/AttributeSettingsTestCase.java
@@ -216,7 +216,7 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
void requireThatMutableConfigIsProperlyPropagated() throws ParseException {
AttributeFields attributes = new AttributeFields(getSearchWithMutables());
AttributesConfig.Builder builder = new AttributesConfig.Builder();
- attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333, true);
+ attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333);
AttributesConfig cfg = builder.build();
assertEquals("a", cfg.attribute().get(0).name());
assertFalse(cfg.attribute().get(0).ismutable());
@@ -232,7 +232,7 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
void requireMaxUnCommittedMemoryIsProperlyPropagated() throws ParseException {
AttributeFields attributes = new AttributeFields(getSearchWithMutables());
AttributesConfig.Builder builder = new AttributesConfig.Builder();
- attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333, true);
+ attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333);
AttributesConfig cfg = builder.build();
assertEquals("a", cfg.attribute().get(0).name());
assertEquals(13333, cfg.attribute().get(0).maxuncommittedmemory());
@@ -244,13 +244,13 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
assertEquals(13333, cfg.attribute().get(2).maxuncommittedmemory());
}
- private void verifyEnableBitVectorDefault(Schema schema, boolean enableBitVectors) {
+ private void verifyEnableBitVectorDefault(Schema schema) {
AttributeFields attributes = new AttributeFields(schema);
AttributesConfig.Builder builder = new AttributesConfig.Builder();
- attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333, enableBitVectors);
+ attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 13333);
AttributesConfig cfg = builder.build();
assertEquals("a", cfg.attribute().get(0).name());
- assertEquals(enableBitVectors, cfg.attribute().get(0).enablebitvectors());
+ assertTrue(cfg.attribute().get(0).enablebitvectors());
assertEquals("b", cfg.attribute().get(1).name());
assertFalse(cfg.attribute().get(1).enablebitvectors());
@@ -270,8 +270,7 @@ public class AttributeSettingsTestCase extends AbstractSchemaTestCase {
" }\n" +
" }\n" +
"}\n");
- verifyEnableBitVectorDefault(schema, false);
- verifyEnableBitVectorDefault(schema, true);
+ verifyEnableBitVectorDefault(schema);
}
@Test
diff --git a/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
index ef1716c80e6..6277b0041df 100644
--- a/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/processing/DictionaryTestCase.java
@@ -24,7 +24,7 @@ public class DictionaryTestCase {
private static AttributesConfig getConfig(Schema schema) {
AttributeFields attributes = new AttributeFields(schema);
AttributesConfig.Builder builder = new AttributesConfig.Builder();
- attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 130000, true);
+ attributes.getConfig(builder, AttributeFields.FieldSet.ALL, 130000);
return builder.build();
}
private Schema createSearch(String def) throws ParseException {
@@ -210,7 +210,7 @@ public class DictionaryTestCase {
" }",
"}");
try {
- ApplicationBuilder sb = ApplicationBuilder.createFromString(def);
+ ApplicationBuilder.createFromString(def);
fail("Controlling dictionary for non-numeric fields are not yet supported.");
} catch (IllegalArgumentException e) {
assertEquals("For schema 'test', field 'n1': You can only specify 'dictionary:' for numeric or string fields", e.getMessage());
@@ -229,7 +229,7 @@ public class DictionaryTestCase {
" }",
"}");
try {
- ApplicationBuilder sb = ApplicationBuilder.createFromString(def);
+ ApplicationBuilder.createFromString(def);
fail("Controlling dictionary for non-fast-search fields are not allowed.");
} catch (IllegalArgumentException e) {
assertEquals("For schema 'test', field 'n1': You must specify 'attribute:fast-search' to allow dictionary control", e.getMessage());