Rename test builder MSQTester.setExpectedSegment (#16837)

* Rename setExpectedSegment to setExpectedSegments in MSQTestBase.

* Add expected segments for max num segments test cases.
This commit is contained in:
Abhishek Radhakrishnan 2024-08-02 10:01:55 -07:00 committed by GitHub
parent 9b731e8f0a
commit fe6772a101
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 81 additions and 69 deletions

View File

@ -230,7 +230,7 @@ public class MSQArraysTest extends MSQTestBase
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedDataSource("foo") .setExpectedDataSource("foo")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
NullHandling.sqlCompatible() NullHandling.sqlCompatible()
? ImmutableList.of( ? ImmutableList.of(
@ -278,7 +278,7 @@ public class MSQArraysTest extends MSQTestBase
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedDataSource("foo") .setExpectedDataSource("foo")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
ImmutableList.of( ImmutableList.of(
new Object[]{0L, null}, new Object[]{0L, null},
@ -325,7 +325,7 @@ public class MSQArraysTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.verifyResults(); .verifyResults();
} }

View File

@ -129,7 +129,7 @@ public class MSQComplexGroupByTest extends MSQTestBase
+ " GROUP BY 1\n" + " GROUP BY 1\n"
+ " PARTITIONED BY ALL") + " PARTITIONED BY ALL")
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(RowSignature.builder() .setExpectedRowSignature(RowSignature.builder()
.add("__time", ColumnType.LONG) .add("__time", ColumnType.LONG)
@ -257,7 +257,7 @@ public class MSQComplexGroupByTest extends MSQTestBase
+ " GROUP BY 1\n" + " GROUP BY 1\n"
+ " PARTITIONED BY ALL") + " PARTITIONED BY ALL")
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(RowSignature.builder() .setExpectedRowSignature(RowSignature.builder()
.add("__time", ColumnType.LONG) .add("__time", ColumnType.LONG)

View File

@ -57,7 +57,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(DEFAULT_MSQ_CONTEXT) .setQueryContext(DEFAULT_MSQ_CONTEXT)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -88,7 +88,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(DEFAULT_MSQ_CONTEXT) .setQueryContext(DEFAULT_MSQ_CONTEXT)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -127,7 +127,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(queryContext) .setQueryContext(queryContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -168,7 +168,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(DEFAULT_MSQ_CONTEXT) .setQueryContext(DEFAULT_MSQ_CONTEXT)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -219,7 +219,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(DEFAULT_MSQ_CONTEXT) .setQueryContext(DEFAULT_MSQ_CONTEXT)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -258,7 +258,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(DEFAULT_MSQ_CONTEXT) .setQueryContext(DEFAULT_MSQ_CONTEXT)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();
@ -335,7 +335,7 @@ public class MSQExportTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(queryContext) .setQueryContext(queryContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of()) .setExpectedSegments(ImmutableSet.of())
.setExpectedResultRows(ImmutableList.of()) .setExpectedResultRows(ImmutableList.of())
.verifyResults(); .verifyResults();

View File

@ -113,7 +113,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(context) .setQueryContext(context)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedMSQSegmentReport( .setExpectedMSQSegmentReport(
new MSQSegmentReport( new MSQSegmentReport(
@ -310,7 +310,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27/P1D"), Intervals.of("2016-06-27/P1D"),
"test", "test",
@ -368,7 +368,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(context) .setQueryContext(context)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
@ -432,7 +432,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(QueryContexts.override(context, ROLLUP_CONTEXT_PARAMS)) .setQueryContext(QueryContexts.override(context, ROLLUP_CONTEXT_PARAMS))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedRollUp(true) .setExpectedRollUp(true)
.addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt")) .addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt"))
@ -457,7 +457,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(context) .setQueryContext(context)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
@ -507,7 +507,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedFooRows()) .setExpectedResultRows(expectedFooRows())
.verifyResults(); .verifyResults();
@ -530,7 +530,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of("foo1", Intervals.of("1970-01-01/P1D"), "test", 0) SegmentId.of("foo1", Intervals.of("1970-01-01/P1D"), "test", 0)
) )
@ -565,7 +565,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(localContext) .setQueryContext(localContext)
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of("foo1", Intervals.of("1970-01-01/P1D"), "test", 0) SegmentId.of("foo1", Intervals.of("1970-01-01/P1D"), "test", 0)
) )
@ -597,7 +597,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of("foo1", Intervals.of("1999-12-31T/P1D"), "test", 0) SegmentId.of("foo1", Intervals.of("1999-12-31T/P1D"), "test", 0)
) )
@ -637,7 +637,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
@ -686,7 +686,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedMultiValueFooRows()) .setExpectedResultRows(expectedMultiValueFooRows())
.verifyResults(); .verifyResults();
} }
@ -704,7 +704,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedMultiValueFooRows()) .setExpectedResultRows(expectedMultiValueFooRows())
.verifyResults(); .verifyResults();
} }
@ -722,7 +722,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedMultiValueFooRows()) .setExpectedResultRows(expectedMultiValueFooRows())
.verifyResults(); .verifyResults();
} }
@ -740,7 +740,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows(expectedMultiValueFooRowsGroupBy()) .setExpectedResultRows(expectedMultiValueFooRowsGroupBy())
.verifyResults(); .verifyResults();
} }
@ -776,7 +776,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
NullHandling.replaceWithDefault() ? NullHandling.replaceWithDefault() ?
ImmutableList.of( ImmutableList.of(
@ -812,7 +812,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
NullHandling.replaceWithDefault() ? NullHandling.replaceWithDefault() ?
ImmutableList.of( ImmutableList.of(
@ -848,7 +848,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(adjustedContext) .setQueryContext(adjustedContext)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
NullHandling.replaceWithDefault() ? NullHandling.replaceWithDefault() ?
ImmutableList.of( ImmutableList.of(
@ -911,7 +911,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedRollUp(true) .setExpectedRollUp(true)
.addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt")) .addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt"))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
@ -969,7 +969,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedQueryGranularity(Granularities.DAY) .setExpectedQueryGranularity(Granularities.DAY)
.addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt")) .addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt"))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
@ -1043,7 +1043,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedQueryGranularity(Granularities.DAY) .setExpectedQueryGranularity(Granularities.DAY)
.addExpectedAggregatorFactory(new HyperUniquesAggregatorFactory("cnt", "cnt", false, true)) .addExpectedAggregatorFactory(new HyperUniquesAggregatorFactory("cnt", "cnt", false, true))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedFooRowsWithAggregatedComplexColumn()) .setExpectedResultRows(expectedFooRowsWithAggregatedComplexColumn())
.verifyResults(); .verifyResults();
@ -1068,7 +1068,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedRollUp(true) .setExpectedRollUp(true)
.addExpectedAggregatorFactory(new HyperUniquesAggregatorFactory("cnt", "cnt", false, true)) .addExpectedAggregatorFactory(new HyperUniquesAggregatorFactory("cnt", "cnt", false, true))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedFooRowsWithAggregatedComplexColumn()) .setExpectedResultRows(expectedFooRowsWithAggregatedComplexColumn())
.verifyResults(); .verifyResults();
@ -1102,7 +1102,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt")) .addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt"))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27/P1D"), Intervals.of("2016-06-27/P1D"),
"test", "test",
@ -1171,7 +1171,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt")) .addExpectedAggregatorFactory(new LongSumAggregatorFactory("cnt", "cnt"))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27/P1D"), Intervals.of("2016-06-27/P1D"),
"test", "test",
@ -1419,6 +1419,13 @@ public class MSQInsertTest extends MSQTestBase
.setQueryContext(context) .setQueryContext(context)
.setExpectedDataSource("foo") .setExpectedDataSource("foo")
.setExpectedRowSignature(expectedRowSignature) .setExpectedRowSignature(expectedRowSignature)
.setExpectedSegments(
ImmutableSet.of(
SegmentId.of("foo", Intervals.of("2023-01-01/P1D"), "test", 0),
SegmentId.of("foo", Intervals.of("2023-01-01/P1D"), "test", 1),
SegmentId.of("foo", Intervals.of("2023-02-01/P1D"), "test", 0)
)
)
.setExpectedResultRows( .setExpectedResultRows(
ImmutableList.of( ImmutableList.of(
new Object[]{1672531200000L, "day1_1"}, new Object[]{1672531200000L, "day1_1"},
@ -1491,7 +1498,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(queryContext) .setQueryContext(queryContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0), SegmentId.of("foo1", Intervals.ETERNITY, "test", 1))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0), SegmentId.of("foo1", Intervals.ETERNITY, "test", 1)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedMSQSegmentReport( .setExpectedMSQSegmentReport(
new MSQSegmentReport( new MSQSegmentReport(
@ -1538,7 +1545,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(localContext) .setQueryContext(localContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27/P1D"), Intervals.of("2016-06-27/P1D"),
"test", "test",
@ -1590,7 +1597,7 @@ public class MSQInsertTest extends MSQTestBase
.setExpectedDataSource("foo1") .setExpectedDataSource("foo1")
.setQueryContext(localContext) .setQueryContext(localContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27/P1D"), Intervals.of("2016-06-27/P1D"),
"test", "test",

View File

@ -142,7 +142,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of("foo", Intervals.of("2000-01-01T/P1D"), "test", 0), SegmentId.of("foo", Intervals.of("2000-01-01T/P1D"), "test", 0),
SegmentId.of("foo", Intervals.of("2000-01-02T/P1D"), "test", 0), SegmentId.of("foo", Intervals.of("2000-01-02T/P1D"), "test", 0),
@ -214,7 +214,7 @@ public class MSQReplaceTest extends MSQTestBase
"2000-01-02T00:00:00.000Z/2000-01-03T00:00:00.000Z"))) "2000-01-02T00:00:00.000Z/2000-01-03T00:00:00.000Z")))
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-02T/P1D"), Intervals.of("2000-01-02T/P1D"),
"test", "test",
@ -284,7 +284,7 @@ public class MSQReplaceTest extends MSQTestBase
"Cannot use RangeShardSpec, RangedShardSpec only supports string CLUSTER BY keys. Using NumberedShardSpec instead." "Cannot use RangeShardSpec, RangedShardSpec only supports string CLUSTER BY keys. Using NumberedShardSpec instead."
) )
) )
.setExpectedSegment(ImmutableSet.of( .setExpectedSegments(ImmutableSet.of(
SegmentId.of( SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27T00:00:00.000Z/2016-06-27T01:00:00.000Z"), Intervals.of("2016-06-27T00:00:00.000Z/2016-06-27T01:00:00.000Z"),
@ -374,7 +374,7 @@ public class MSQReplaceTest extends MSQTestBase
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(ImmutableList.of(Intervals.of( .setExpectedDestinationIntervals(ImmutableList.of(Intervals.of(
"2016-06-27T01:00:00.000Z/2016-06-27T02:00:00.000Z"))) "2016-06-27T01:00:00.000Z/2016-06-27T02:00:00.000Z")))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo1", "foo1",
Intervals.of("2016-06-27T01:00:00.000Z/2016-06-27T02:00:00.000Z"), Intervals.of("2016-06-27T01:00:00.000Z/2016-06-27T02:00:00.000Z"),
"test", "test",
@ -453,7 +453,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -469,7 +469,7 @@ public class MSQReplaceTest extends MSQTestBase
new Object[]{978480000000L, 6.0f} new Object[]{978480000000L, 6.0f}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
.with().totalFiles(1), .with().totalFiles(1),
@ -542,7 +542,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -558,7 +558,7 @@ public class MSQReplaceTest extends MSQTestBase
new Object[]{978480000000L, 6.0f} new Object[]{978480000000L, 6.0f}
) )
) )
.setExpectedSegment(ImmutableSet.of( .setExpectedSegments(ImmutableSet.of(
SegmentId.of("foo", Intervals.of("2000-01-01T/P1M"), "test", 0), SegmentId.of("foo", Intervals.of("2000-01-01T/P1M"), "test", 0),
SegmentId.of("foo", Intervals.of("2001-01-01T/P1M"), "test", 0) SegmentId.of("foo", Intervals.of("2001-01-01T/P1M"), "test", 0)
) )
@ -628,7 +628,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2000-03-01T"))) .setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2000-03-01T")))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -640,7 +640,7 @@ public class MSQReplaceTest extends MSQTestBase
new Object[]{946771200000L, 2.0f} new Object[]{946771200000L, 2.0f}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -720,7 +720,7 @@ public class MSQReplaceTest extends MSQTestBase
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2002-01-01T"))) .setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2002-01-01T")))
.setExpectedTombstoneIntervals(ImmutableSet.of(Intervals.of("2001-01-01T/2001-02-01T"))) .setExpectedTombstoneIntervals(ImmutableSet.of(Intervals.of("2001-01-01T/2001-02-01T")))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -816,6 +816,11 @@ public class MSQReplaceTest extends MSQTestBase
.setQueryContext(context) .setQueryContext(context)
.setExpectedDataSource("foo") .setExpectedDataSource("foo")
.setExpectedRowSignature(expectedRowSignature) .setExpectedRowSignature(expectedRowSignature)
.setExpectedSegments(
ImmutableSet.of(
SegmentId.of("foo", Intervals.ETERNITY, "test", 0)
)
)
.setExpectedResultRows( .setExpectedResultRows(
ImmutableList.of( ImmutableList.of(
new Object[]{1672531200000L, "day1_1"}, new Object[]{1672531200000L, "day1_1"},
@ -893,7 +898,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2000-03-01T"))) .setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2000-03-01T")))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -950,7 +955,7 @@ public class MSQReplaceTest extends MSQTestBase
.setQueryContext(queryContext) .setQueryContext(queryContext)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setExpectedShardSpec(DimensionRangeShardSpec.class) .setExpectedShardSpec(DimensionRangeShardSpec.class)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0), SegmentId.of("foo1", Intervals.ETERNITY, "test", 1))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0), SegmentId.of("foo1", Intervals.ETERNITY, "test", 1)))
.setExpectedResultRows(expectedRows) .setExpectedResultRows(expectedRows)
.setExpectedMSQSegmentReport( .setExpectedMSQSegmentReport(
new MSQSegmentReport( new MSQSegmentReport(
@ -1009,7 +1014,7 @@ public class MSQReplaceTest extends MSQTestBase
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2002-01-01T"))) .setExpectedDestinationIntervals(Collections.singletonList(Intervals.of("2000-01-01T/2002-01-01T")))
.setExpectedTombstoneIntervals(ImmutableSet.of(Intervals.of("2001-01-01T/2001-02-01T"))) .setExpectedTombstoneIntervals(ImmutableSet.of(Intervals.of("2001-01-01T/2001-02-01T")))
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -1071,7 +1076,7 @@ public class MSQReplaceTest extends MSQTestBase
Intervals.of("%s/%s", "2000-02-01", Intervals.ETERNITY.getEnd()) Intervals.of("%s/%s", "2000-02-01", Intervals.ETERNITY.getEnd())
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -1119,7 +1124,7 @@ public class MSQReplaceTest extends MSQTestBase
) )
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(expectedFooSegments()) .setExpectedSegments(expectedFooSegments())
.setExpectedResultRows(expectedFooRows()) .setExpectedResultRows(expectedFooRows())
.setExpectedLastCompactionState( .setExpectedLastCompactionState(
expectedCompactionState( expectedCompactionState(
@ -1161,7 +1166,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedShardSpec(DimensionRangeShardSpec.class) .setExpectedShardSpec(DimensionRangeShardSpec.class)
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
ImmutableList.of( ImmutableList.of(
new Object[]{0L, NullHandling.sqlCompatible() ? "" : null, 1.0f, 1L}, new Object[]{0L, NullHandling.sqlCompatible() ? "" : null, 1.0f, 1L},
@ -1206,7 +1211,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foobar", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foobar", Intervals.ETERNITY, "test", 0)))
.setExpectedResultRows( .setExpectedResultRows(
ImmutableList.of( ImmutableList.of(
new Object[]{946684800000L, 1.0f}, new Object[]{946684800000L, 1.0f},
@ -1248,7 +1253,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of( SegmentId.of(
"foobar", "foobar",
@ -1324,7 +1329,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -1348,7 +1353,7 @@ public class MSQReplaceTest extends MSQTestBase
new Object[]{978480000000L, null} new Object[]{978480000000L, null}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
.with().totalFiles(1), .with().totalFiles(1),
@ -1399,7 +1404,7 @@ public class MSQReplaceTest extends MSQTestBase
.setExpectedRowSignature(rowSignature) .setExpectedRowSignature(rowSignature)
.setQueryContext(context) .setQueryContext(context)
.setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY) .setExpectedDestinationIntervals(Intervals.ONLY_ETERNITY)
.setExpectedSegment(ImmutableSet.of(SegmentId.of( .setExpectedSegments(ImmutableSet.of(SegmentId.of(
"foo", "foo",
Intervals.of("2000-01-01T/P1M"), Intervals.of("2000-01-01T/P1M"),
"test", "test",
@ -1421,7 +1426,7 @@ public class MSQReplaceTest extends MSQTestBase
new Object[]{978480000000L, 6.0f} new Object[]{978480000000L, 6.0f}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.setExpectedCountersForStageWorkerChannel( .setExpectedCountersForStageWorkerChannel(
CounterSnapshotMatcher CounterSnapshotMatcher
.with().totalFiles(1), .with().totalFiles(1),

View File

@ -1584,7 +1584,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 6.0, null} new Object[]{978480000000L, 6.0f, 6.0, null}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
@ -1615,7 +1615,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 6.0} new Object[]{978480000000L, 6.0f, 6.0}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
@ -1646,7 +1646,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 21.0} new Object[]{978480000000L, 6.0f, 21.0}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
@ -1677,7 +1677,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 21.0} new Object[]{978480000000L, 6.0f, 21.0}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
@ -1709,7 +1709,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 21.0, 21.0} new Object[]{978480000000L, 6.0f, 21.0, 21.0}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
@ -1741,7 +1741,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{978480000000L, 6.0f, 6.0, 6.0} new Object[]{978480000000L, 6.0f, 6.0, 6.0}
) )
) )
.setExpectedSegment( .setExpectedSegments(
ImmutableSet.of( ImmutableSet.of(
SegmentId.of("foo1", Intervals.of("2000-01-01T/P1D"), "test", 0), SegmentId.of("foo1", Intervals.of("2000-01-01T/P1D"), "test", 0),
SegmentId.of("foo1", Intervals.of("2000-01-02T/P1D"), "test", 0), SegmentId.of("foo1", Intervals.of("2000-01-02T/P1D"), "test", 0),
@ -2045,7 +2045,7 @@ public class MSQWindowTest extends MSQTestBase
new Object[]{0L, 129L, "Albuquerque", 140L} new Object[]{0L, 129L, "Albuquerque", 140L}
) )
) )
.setExpectedSegment(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0))) .setExpectedSegments(ImmutableSet.of(SegmentId.of("foo1", Intervals.ETERNITY, "test", 0)))
.verifyResults(); .verifyResults();
} }
} }

View File

@ -904,7 +904,7 @@ public class MSQTestBase extends BaseCalciteQueryTest
return asBuilder(); return asBuilder();
} }
public Builder setExpectedSegment(Set<SegmentId> expectedSegments) public Builder setExpectedSegments(Set<SegmentId> expectedSegments)
{ {
Preconditions.checkArgument(expectedSegments != null, "Segments cannot be null"); Preconditions.checkArgument(expectedSegments != null, "Segments cannot be null");
this.expectedSegments = expectedSegments; this.expectedSegments = expectedSegments;