Skip to content

Commit 60b659f

Browse files
LantaoJinLantaoJin
committed
Fix IT
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent b9c5326 commit 60b659f

5 files changed

Lines changed: 65 additions & 65 deletions

File tree

‎integ-test/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ integTest {
444444

445445
dependsOn ':opensearch-sql-plugin:bundlePlugin'
446446
if(getOSFamilyType() != "windows") {
447-
dependsOn startPrometheus
447+
// dependsOn startPrometheus
448448
finalizedBy stopPrometheus
449449
}
450450

‎integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -230,19 +230,19 @@ public void groupByUsingTableNamePrefixTest() throws Exception {
230230

231231
private void assertResultForGroupByTest(JSONObject result) {
232232
Assert.assertThat(getTotalHits(result), equalTo(1000));
233-
JSONObject gender = getAggregation(result, "gender");
233+
JSONObject gender = getAggregation(result, "gender.keyword");
234234
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
235235

236-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
236+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
237237
final int maleBucketId = isMaleFirst ? 0 : 1;
238238
final int femaleBucketId = isMaleFirst ? 1 : 0;
239239

240240
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
241241
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
242242

243-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
243+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
244244
Assert.assertThat(gender.query(maleBucketPrefix + "/COUNT(*)/value"), equalTo(507));
245-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
245+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
246246
Assert.assertThat(gender.query(femaleBucketPrefix + "/COUNT(*)/value"), equalTo(493));
247247
}
248248

@@ -281,19 +281,19 @@ public void groupByHavingUsingTableNamePrefixTest() throws Exception {
281281

282282
private void assertResultForGroupByHavingTest(JSONObject result) {
283283
Assert.assertThat(getTotalHits(result), equalTo(1000));
284-
JSONObject gender = getAggregation(result, "gender");
284+
JSONObject gender = getAggregation(result, "gender.keyword");
285285
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
286286

287-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
287+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
288288
final int maleBucketId = isMaleFirst ? 0 : 1;
289289
final int femaleBucketId = isMaleFirst ? 1 : 0;
290290

291291
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
292292
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
293293

294-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
294+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
295295
Assert.assertThat(gender.query(maleBucketPrefix + "/count_0/value"), equalTo(507));
296-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
296+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
297297
Assert.assertThat(gender.query(femaleBucketPrefix + "/count_0/value"), equalTo(493));
298298
}
299299

@@ -309,19 +309,19 @@ public void groupBySubqueryTest() throws Exception {
309309
+ "GROUP BY gender",
310310
TEST_INDEX_ACCOUNT, TEST_INDEX_ACCOUNT));
311311
Assert.assertThat(getTotalHits(result), equalTo(1000));
312-
JSONObject gender = getAggregation(result, "gender");
312+
JSONObject gender = getAggregation(result, "gender.keyword");
313313
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
314314

315-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
315+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
316316
final int maleBucketId = isMaleFirst ? 0 : 1;
317317
final int femaleBucketId = isMaleFirst ? 1 : 0;
318318

319319
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
320320
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
321321

322-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
322+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
323323
Assert.assertThat(gender.query(maleBucketPrefix + "/COUNT(*)/value"), equalTo(507));
324-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
324+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
325325
Assert.assertThat(gender.query(femaleBucketPrefix + "/COUNT(*)/value"), equalTo(493));
326326
}
327327

@@ -335,19 +335,19 @@ public void postFilterTest() throws Exception {
335335
+ "{\\\"gender\\\":\\\"m\\\"}}) */ COUNT(*) FROM %s GROUP BY gender",
336336
TEST_INDEX_ACCOUNT));
337337
Assert.assertThat(getTotalHits(result), equalTo(507));
338-
JSONObject gender = getAggregation(result, "gender");
338+
JSONObject gender = getAggregation(result, "gender.keyword");
339339
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
340340

341-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
341+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
342342
final int maleBucketId = isMaleFirst ? 0 : 1;
343343
final int femaleBucketId = isMaleFirst ? 1 : 0;
344344

345345
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
346346
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
347347

348-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
348+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
349349
Assert.assertThat(gender.query(maleBucketPrefix + "/COUNT(*)/value"), equalTo(507));
350-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
350+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
351351
Assert.assertThat(gender.query(femaleBucketPrefix + "/COUNT(*)/value"), equalTo(493));
352352
}
353353

@@ -361,10 +361,10 @@ public void multipleGroupByTest() throws Exception {
361361
+ " terms('field'='age','size'=200,'alias'='age')",
362362
TEST_INDEX_ACCOUNT));
363363
Assert.assertThat(getTotalHits(result), equalTo(1000));
364-
JSONObject gender = getAggregation(result, "gender");
364+
JSONObject gender = getAggregation(result, "gender.keyword");
365365
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
366366

367-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
367+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
368368
final int maleBucketId = isMaleFirst ? 0 : 1;
369369
final int femaleBucketId = isMaleFirst ? 1 : 0;
370370

@@ -403,7 +403,7 @@ public void multipleGroupBysWithSize() throws Exception {
403403
+ " terms('alias'='ageAgg','field'='age','size'=3)",
404404
TEST_INDEX_ACCOUNT));
405405
Assert.assertThat(getTotalHits(result), equalTo(1000));
406-
JSONObject gender = getAggregation(result, "gender");
406+
JSONObject gender = getAggregation(result, "gender.keyword");
407407
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
408408

409409
final JSONArray mAgeBuckets = (JSONArray) (gender.optQuery("/buckets/0/ageAgg/buckets"));
@@ -543,7 +543,7 @@ public void orderByGroupFieldWithAlias() throws IOException {
543543
TEST_INDEX_ACCOUNT));
544544

545545
verifySchema(response, schema("gender", "g", "text"), schema("COUNT(*)", "count", "integer"));
546-
verifyDataRowsInOrder(response, rows("f", 493), rows("m", 507));
546+
verifyDataRowsInOrder(response, rows("F", 493), rows("M", 507));
547547

548548
// ORDER BY field alias
549549
response =
@@ -553,7 +553,7 @@ public void orderByGroupFieldWithAlias() throws IOException {
553553
TEST_INDEX_ACCOUNT));
554554

555555
verifySchema(response, schema("gender", "g", "text"), schema("COUNT(*)", "count", "integer"));
556-
verifyDataRowsInOrder(response, rows("f", 493), rows("m", 507));
556+
verifyDataRowsInOrder(response, rows("F", 493), rows("M", 507));
557557
}
558558

559559
@Test
@@ -648,17 +648,17 @@ public void topHitTest() throws IOException {
648648
String.format(
649649
"select topHits('size'=3,age='desc') from %s group by gender", TEST_INDEX_ACCOUNT);
650650
JSONObject result = executeQuery(query);
651-
JSONObject gender = getAggregation(result, "gender");
651+
JSONObject gender = getAggregation(result, "gender.keyword");
652652
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
653653

654-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
654+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
655655
final int maleBucketId = isMaleFirst ? 0 : 1;
656656
final int femaleBucketId = isMaleFirst ? 1 : 0;
657657

658658
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
659659
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
660660

661-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
661+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
662662
Assert.assertThat(
663663
gender.query(maleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
664664
equalTo(507));
@@ -669,7 +669,7 @@ public void topHitTest() throws IOException {
669669
((JSONArray) gender.query(maleBucketPrefix + "/topHits(size=3,age=desc)/hits/hits"))
670670
.length(),
671671
equalTo(3));
672-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
672+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
673673
Assert.assertThat(
674674
gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc)/hits/total/value"),
675675
equalTo(493));
@@ -690,17 +690,17 @@ public void topHitTest_WithInclude() throws IOException {
690690
"select topHits('size'=3,age='desc','include'=age) from %s group by gender",
691691
TEST_INDEX_ACCOUNT);
692692
JSONObject result = executeQuery(query);
693-
JSONObject gender = getAggregation(result, "gender");
693+
JSONObject gender = getAggregation(result, "gender.keyword");
694694
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
695695

696-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
696+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
697697
final int maleBucketId = isMaleFirst ? 0 : 1;
698698
final int femaleBucketId = isMaleFirst ? 1 : 0;
699699

700700
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
701701
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
702702

703-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
703+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
704704
Assert.assertThat(
705705
gender.query(maleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/value"),
706706
equalTo(507));
@@ -714,7 +714,7 @@ public void topHitTest_WithInclude() throws IOException {
714714
.length(),
715715
equalTo(3));
716716

717-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
717+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
718718
Assert.assertThat(
719719
gender.query(femaleBucketPrefix + "/topHits(size=3,age=desc,include=age)/hits/total/value"),
720720
equalTo(493));
@@ -755,7 +755,7 @@ public void topHitTest_WithIncludeTwoFields() throws IOException {
755755
+ "group by gender",
756756
TEST_INDEX_ACCOUNT);
757757
JSONObject result = executeQuery(query);
758-
JSONObject gender = getAggregation(result, "gender");
758+
JSONObject gender = getAggregation(result, "gender.keyword");
759759
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
760760

761761
for (int i = 0; i < 2; ++i) {
@@ -786,17 +786,17 @@ public void topHitTest_WithExclude() throws IOException {
786786
"select topHits('size'=3,'exclude'='lastname',age='desc') from " + "%s group by gender",
787787
TEST_INDEX_ACCOUNT);
788788
JSONObject result = executeQuery(query);
789-
JSONObject gender = getAggregation(result, "gender");
789+
JSONObject gender = getAggregation(result, "gender.keyword");
790790
Assert.assertThat(gender.getJSONArray("buckets").length(), equalTo(2));
791791

792-
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("m");
792+
final boolean isMaleFirst = gender.optQuery("/buckets/0/key").equals("M");
793793
final int maleBucketId = isMaleFirst ? 0 : 1;
794794
final int femaleBucketId = isMaleFirst ? 1 : 0;
795795

796796
final String maleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", maleBucketId);
797797
final String femaleBucketPrefix = String.format(Locale.ROOT, "/buckets/%d", femaleBucketId);
798798

799-
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("m"));
799+
Assert.assertThat(gender.query(maleBucketPrefix + "/key"), equalTo("M"));
800800
Assert.assertThat(
801801
gender.query(
802802
maleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
@@ -812,7 +812,7 @@ public void topHitTest_WithExclude() throws IOException {
812812
.length(),
813813
equalTo(3));
814814

815-
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("f"));
815+
Assert.assertThat(gender.query(femaleBucketPrefix + "/key"), equalTo("F"));
816816
Assert.assertThat(
817817
gender.query(
818818
femaleBucketPrefix + "/topHits(size=3,exclude=lastname,age=desc)/hits/total/value"),
@@ -1026,8 +1026,8 @@ public void topHitTest_WithExclude() throws IOException {
10261026
// }
10271027
//
10281028
// Assert.assertEquals(2, buckets.keySet().size());
1029-
// Assert.assertEquals(expectedAges, buckets.get("m"));
1030-
// Assert.assertEquals(expectedAges, buckets.get("f"));
1029+
// Assert.assertEquals(expectedAges, buckets.get("M"));
1030+
// Assert.assertEquals(expectedAges, buckets.get("F"));
10311031
//
10321032
// Terms state = result.get("state.keyword");
10331033
// for(Terms.Bucket stateBucket : state.getBuckets()) {
@@ -1053,8 +1053,8 @@ public void topHitTest_WithExclude() throws IOException {
10531053
// Terms gender = result.get("gender");
10541054
// for(Terms.Bucket genderBucket : gender.getBuckets()) {
10551055
// String genderKey = genderBucket.getKey().toString();
1056-
// Assert.assertTrue("Gender should be m or f", genderKey.equals("m") ||
1057-
// genderKey.equals("f"));
1056+
// Assert.assertTrue("Gender should be m or f", genderKey.equals("M") ||
1057+
// genderKey.equals("F"));
10581058
// }
10591059
//
10601060
// Assert.assertEquals(2, gender.getBuckets().size());
@@ -1125,14 +1125,14 @@ public void topHitTest_WithExclude() throws IOException {
11251125
// @Test
11261126
// public void groupByTestWithFilter() throws Exception {
11271127
// Aggregations result = query(String.format("SELECT COUNT(*) FROM %s GROUP BY
1128-
// filter(gender='m'),gender", TEST_INDEX_ACCOUNT));
1129-
// InternalFilter filter = result.get("filter(gender = 'm')@FILTER");
1128+
// filter(gender='M'),gender", TEST_INDEX_ACCOUNT));
1129+
// InternalFilter filter = result.get("filter(gender = 'M')@FILTER");
11301130
// Terms gender = filter.getAggregations().get("gender");
11311131
//
11321132
// for(Terms.Bucket bucket : gender.getBuckets()) {
11331133
// String key = bucket.getKey().toString();
11341134
// long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
1135-
// if(key.equalsIgnoreCase("m")) {
1135+
// if(key.equalsIgnoreCase("M")) {
11361136
// Assert.assertEquals(507, count);
11371137
// }
11381138
// else {

‎integ-test/src/test/java/org/opensearch/sql/legacy/QueryIT.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -569,19 +569,19 @@ public void doubleNotTest() throws IOException {
569569
Locale.ROOT,
570570
"SELECT * FROM %s WHERE gender LIKE 'm' AND NOT gender LIKE 'f'",
571571
TEST_INDEX_ACCOUNT));
572-
// Assert there are results and they all have gender 'm'
572+
// Assert there are results and they all have gender 'M'
573573
Assert.assertNotEquals(0, getTotalHits(response4));
574574
JSONArray hits = getHits(response4);
575575
for (int i = 0; i < hits.length(); i++) {
576576
JSONObject hit = hits.getJSONObject(i);
577-
Assert.assertEquals("m", getSource(hit).getString("gender").toLowerCase());
577+
Assert.assertEquals("M", getSource(hit).getString("gender"));
578578
}
579579

580580
JSONObject response5 =
581581
executeQuery(
582582
String.format(
583583
Locale.ROOT,
584-
"SELECT * FROM %s WHERE NOT (gender = 'm' OR gender = 'f')",
584+
"SELECT * FROM %s WHERE NOT (gender = 'M' OR gender = 'F')",
585585
TEST_INDEX_ACCOUNT));
586586
Assert.assertEquals(0, getTotalHits(response5));
587587
}
@@ -942,50 +942,50 @@ public void notMissFilterSearch() throws IOException {
942942
@Test
943943
public void complexConditionQuery() throws IOException {
944944
String errorMessage =
945-
"Result does not exist to the condition (gender='m' AND (age> 25 OR account_number>5)) OR"
946-
+ " (gender='f' AND (age>30 OR account_number < 8)";
945+
"Result does not exist to the condition (gender='M' AND (age> 25 OR account_number>5)) OR"
946+
+ " (gender='F' AND (age>30 OR account_number < 8)";
947947

948948
JSONObject response =
949949
executeQuery(
950950
String.format(
951951
Locale.ROOT,
952952
"SELECT * "
953953
+ "FROM %s "
954-
+ "WHERE (gender='m' AND (age> 25 OR account_number>5)) "
955-
+ "OR (gender='f' AND (age>30 OR account_number < 8))",
954+
+ "WHERE (gender='M' AND (age> 25 OR account_number>5)) "
955+
+ "OR (gender='F' AND (age>30 OR account_number < 8))",
956956
TEST_INDEX_ACCOUNT));
957957

958958
JSONArray hits = getHits(response);
959959
for (int i = 0; i < hits.length(); i++) {
960960
JSONObject hit = hits.getJSONObject(i);
961961
JSONObject source = getSource(hit);
962962

963-
String gender = source.getString("gender").toLowerCase();
963+
String gender = source.getString("gender");
964964
int age = source.getInt("age");
965965
int accountNumber = source.getInt("account_number");
966966

967967
Assert.assertTrue(
968968
errorMessage,
969-
(gender.equals("m") && (age > 25 || accountNumber > 5))
970-
|| (gender.equals("f") && (age > 30 || accountNumber < 8)));
969+
(gender.equals("M") && (age > 25 || accountNumber > 5))
970+
|| (gender.equals("F") && (age > 30 || accountNumber < 8)));
971971
}
972972
}
973973

974974
@Test
975975
public void complexNotConditionQuery() throws IOException {
976976
String errorMessage =
977977
"Result does not exist to the condition "
978-
+ "NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) "
979-
+ "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))";
978+
+ "NOT (gender='M' AND NOT (age > 25 OR account_number > 5)) "
979+
+ "OR (NOT gender='F' AND NOT (age > 30 OR account_number < 8))";
980980

981981
JSONObject response =
982982
executeQuery(
983983
String.format(
984984
Locale.ROOT,
985985
"SELECT * "
986986
+ "FROM %s "
987-
+ "WHERE NOT (gender='m' AND NOT (age > 25 OR account_number > 5)) "
988-
+ "OR (NOT gender='f' AND NOT (age > 30 OR account_number < 8))",
987+
+ "WHERE NOT (gender='M' AND NOT (age > 25 OR account_number > 5)) "
988+
+ "OR (NOT gender='F' AND NOT (age > 30 OR account_number < 8))",
989989
TEST_INDEX_ACCOUNT));
990990

991991
JSONArray hits = getHits(response);
@@ -994,14 +994,14 @@ public void complexNotConditionQuery() throws IOException {
994994
JSONObject hit = hits.getJSONObject(i);
995995
JSONObject source = getSource(hit);
996996

997-
String gender = source.getString("gender").toLowerCase();
997+
String gender = source.getString("gender");
998998
int age = source.getInt("age");
999999
int accountNumber = source.getInt("account_number");
10001000

10011001
Assert.assertTrue(
10021002
errorMessage,
1003-
!(gender.equals("m") && !(age > 25 || accountNumber > 5))
1004-
|| (!gender.equals("f") && !(age > 30 || accountNumber < 8)));
1003+
!(gender.equals("M") && !(age > 25 || accountNumber > 5))
1004+
|| (!gender.equals("F") && !(age > 30 || accountNumber < 8)));
10051005
}
10061006
}
10071007

0 commit comments

Comments
 (0)