|
34 | 34 |
|
35 | 35 | import org.apache.lucene.index.DocValuesType; |
36 | 36 | import org.apache.lucene.index.IndexableField; |
| 37 | +import org.opensearch.common.settings.Settings; |
| 38 | +import org.opensearch.common.util.FeatureFlags; |
37 | 39 | import org.opensearch.common.xcontent.XContentFactory; |
38 | 40 | import org.opensearch.core.common.bytes.BytesReference; |
39 | 41 | import org.opensearch.core.xcontent.MediaTypeRegistry; |
40 | 42 | import org.opensearch.core.xcontent.XContentBuilder; |
| 43 | +import org.opensearch.index.compositeindex.datacube.startree.StarTreeIndexSettings; |
41 | 44 | import org.opensearch.plugins.Plugin; |
| 45 | +import org.junit.AfterClass; |
| 46 | +import org.junit.BeforeClass; |
42 | 47 |
|
43 | 48 | import java.io.IOException; |
44 | 49 | import java.util.Arrays; |
45 | 50 | import java.util.Collection; |
46 | 51 | import java.util.List; |
47 | 52 |
|
48 | 53 | import static java.util.Collections.singletonList; |
| 54 | +import static org.opensearch.common.util.FeatureFlags.STAR_TREE_INDEX; |
49 | 55 | import static org.hamcrest.Matchers.containsString; |
50 | 56 |
|
51 | 57 | public class ScaledFloatFieldMapperTests extends MapperTestCase { |
@@ -91,24 +97,112 @@ public void testExistsQueryDocValuesDisabled() throws IOException { |
91 | 97 | assertParseMinimalWarnings(); |
92 | 98 | } |
93 | 99 |
|
94 | | - public void testDefaults() throws Exception { |
95 | | - XContentBuilder mapping = fieldMapping(b -> b.field("type", "scaled_float").field("scaling_factor", 10.0)); |
| 100 | + @BeforeClass |
| 101 | + public static void createMapper() { |
| 102 | + FeatureFlags.initializeFeatureFlags(Settings.builder().put(STAR_TREE_INDEX, "true").build()); |
| 103 | + } |
| 104 | + |
| 105 | + @AfterClass |
| 106 | + public static void clearMapper() { |
| 107 | + FeatureFlags.initializeFeatureFlags(Settings.EMPTY); |
| 108 | + } |
| 109 | + |
| 110 | + public void testScaledFloatWithStarTree() throws Exception { |
| 111 | + |
| 112 | + double scalingFactorField1 = randomDouble() * 100; |
| 113 | + double scalingFactorField2 = randomDouble() * 100; |
| 114 | + double scalingFactorField3 = randomDouble() * 100; |
| 115 | + |
| 116 | + XContentBuilder mapping = getStarTreeMappingWithScaledFloat(scalingFactorField1, scalingFactorField2, scalingFactorField3); |
96 | 117 | DocumentMapper mapper = createDocumentMapper(mapping); |
97 | | - assertEquals(mapping.toString(), mapper.mappingSource().toString()); |
| 118 | + assertTrue(mapping.toString().contains("startree")); |
98 | 119 |
|
99 | | - ParsedDocument doc = mapper.parse(source(b -> b.field("field", 123))); |
100 | | - IndexableField[] fields = doc.rootDoc().getFields("field"); |
| 120 | + long randomLongField1 = randomLong(); |
| 121 | + long randomLongField2 = randomLong(); |
| 122 | + long randomLongField3 = randomLong(); |
| 123 | + ParsedDocument doc = mapper.parse( |
| 124 | + source(b -> b.field("field1", randomLongField1).field("field2", randomLongField2).field("field3", randomLongField3)) |
| 125 | + ); |
| 126 | + validateScaledFloatFields(doc, "field1", randomLongField1, scalingFactorField1); |
| 127 | + validateScaledFloatFields(doc, "field2", randomLongField2, scalingFactorField2); |
| 128 | + validateScaledFloatFields(doc, "field3", randomLongField3, scalingFactorField3); |
| 129 | + } |
| 130 | + |
| 131 | + @Override |
| 132 | + protected Settings getIndexSettings() { |
| 133 | + return Settings.builder() |
| 134 | + .put(StarTreeIndexSettings.IS_COMPOSITE_INDEX_SETTING.getKey(), true) |
| 135 | + .put(super.getIndexSettings()) |
| 136 | + .build(); |
| 137 | + } |
| 138 | + |
| 139 | + private static void validateScaledFloatFields(ParsedDocument doc, String field, long value, double scalingFactor) { |
| 140 | + IndexableField[] fields = doc.rootDoc().getFields(field); |
101 | 141 | assertEquals(2, fields.length); |
102 | 142 | IndexableField pointField = fields[0]; |
103 | 143 | assertEquals(1, pointField.fieldType().pointDimensionCount()); |
104 | 144 | assertFalse(pointField.fieldType().stored()); |
105 | | - assertEquals(1230, pointField.numericValue().longValue()); |
| 145 | + assertEquals((long) (value * scalingFactor), pointField.numericValue().longValue()); |
106 | 146 | IndexableField dvField = fields[1]; |
107 | 147 | assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); |
108 | | - assertEquals(1230, dvField.numericValue().longValue()); |
| 148 | + assertEquals((long) (value * scalingFactor), dvField.numericValue().longValue()); |
109 | 149 | assertFalse(dvField.fieldType().stored()); |
110 | 150 | } |
111 | 151 |
|
| 152 | + private XContentBuilder getStarTreeMappingWithScaledFloat( |
| 153 | + double scalingFactorField1, |
| 154 | + double scalingFactorField2, |
| 155 | + double scalingFactorField3 |
| 156 | + ) throws IOException { |
| 157 | + return topMapping(b -> { |
| 158 | + b.startObject("composite"); |
| 159 | + b.startObject("startree"); |
| 160 | + b.field("type", "star_tree"); |
| 161 | + b.startObject("config"); |
| 162 | + b.field("max_leaf_docs", 100); |
| 163 | + b.startArray("ordered_dimensions"); |
| 164 | + b.startObject(); |
| 165 | + b.field("name", "field1"); |
| 166 | + b.endObject(); |
| 167 | + b.startObject(); |
| 168 | + b.field("name", "field2"); |
| 169 | + b.endObject(); |
| 170 | + b.endArray(); |
| 171 | + b.startArray("metrics"); |
| 172 | + b.startObject(); |
| 173 | + b.field("name", "field3"); |
| 174 | + b.startArray("stats"); |
| 175 | + b.value("sum"); |
| 176 | + b.value("value_count"); |
| 177 | + b.endArray(); |
| 178 | + b.endObject(); |
| 179 | + b.endArray(); |
| 180 | + b.endObject(); |
| 181 | + b.endObject(); |
| 182 | + b.endObject(); |
| 183 | + b.startObject("properties"); |
| 184 | + b.startObject("field1"); |
| 185 | + b.field("type", "scaled_float").field("scaling_factor", scalingFactorField1); |
| 186 | + b.endObject(); |
| 187 | + b.startObject("field2"); |
| 188 | + b.field("type", "scaled_float").field("scaling_factor", scalingFactorField2); |
| 189 | + b.endObject(); |
| 190 | + b.startObject("field3"); |
| 191 | + b.field("type", "scaled_float").field("scaling_factor", scalingFactorField3); |
| 192 | + b.endObject(); |
| 193 | + b.endObject(); |
| 194 | + }); |
| 195 | + } |
| 196 | + |
| 197 | + public void testDefaults() throws Exception { |
| 198 | + XContentBuilder mapping = fieldMapping(b -> b.field("type", "scaled_float").field("scaling_factor", 10.0)); |
| 199 | + DocumentMapper mapper = createDocumentMapper(mapping); |
| 200 | + assertEquals(mapping.toString(), mapper.mappingSource().toString()); |
| 201 | + |
| 202 | + ParsedDocument doc = mapper.parse(source(b -> b.field("field", 123))); |
| 203 | + validateScaledFloatFields(doc, "field", 123, 10.0); |
| 204 | + } |
| 205 | + |
112 | 206 | public void testMissingScalingFactor() { |
113 | 207 | Exception e = expectThrows( |
114 | 208 | MapperParsingException.class, |
|
0 commit comments