morningman commented on a change in pull request #6554:
URL: https://github.com/apache/incubator-doris/pull/6554#discussion_r715273199
##########
File path:
fe/fe-core/src/main/java/org/apache/doris/clone/DynamicPartitionScheduler.java
##########
@@ -261,38 +279,61 @@ private void setStorageMediumProperty(HashMap<String,
String> partitionPropertie
String lowerBorder =
DynamicPartitionUtil.getPartitionRangeString(dynamicPartitionProperty,
now, dynamicPartitionProperty.getStart(), partitionFormat);
String upperBorder =
DynamicPartitionUtil.getPartitionRangeString(dynamicPartitionProperty,
- now, 0, partitionFormat);
+ now, dynamicPartitionProperty.getEnd() + 1, partitionFormat);
PartitionValue lowerPartitionValue = new PartitionValue(lowerBorder);
PartitionValue upperPartitionValue = new PartitionValue(upperBorder);
+ List<Range<PartitionKey>> reservedHistoryPartitionKeyRangeList = new
ArrayList<Range<PartitionKey>>();
Range<PartitionKey> reservePartitionKeyRange;
try {
PartitionKey lowerBound =
PartitionKey.createPartitionKey(Collections.singletonList(lowerPartitionValue),
Collections.singletonList(partitionColumn));
PartitionKey upperBound =
PartitionKey.createPartitionKey(Collections.singletonList(upperPartitionValue),
Collections.singletonList(partitionColumn));
reservePartitionKeyRange = Range.closedOpen(lowerBound,
upperBound);
+ reservedHistoryPartitionKeyRangeList.add(reservePartitionKeyRange);
} catch (AnalysisException | IllegalArgumentException e) {
// AnalysisException: keys.size is always equal to column.size,
cannot reach this exception
// IllegalArgumentException: lb is greater than ub
LOG.warn("Error in gen reservePartitionKeyRange. Error={}, db: {},
table: {}", e.getMessage(),
db.getFullName(), olapTable.getName());
return dropPartitionClauses;
}
+
+ String reservedHistoryPeriods =
dynamicPartitionProperty.getReservedHistoryPeriods();
+ List<Range> ranges =
DynamicPartitionUtil.convertStringToPeriodsList(reservedHistoryPeriods);
+
+ if (ranges.size() != 0) {
+ for (Range range : ranges) {
+ try {
+ String lowerBorderOfReservedHistory =
DynamicPartitionUtil.getHistoryPartitionRangeString(dynamicPartitionProperty,
range.lowerEndpoint().toString(), partitionFormat);
+ String upperBorderOfReservedHistory =
DynamicPartitionUtil.getHistoryPartitionRangeString(dynamicPartitionProperty,
range.upperEndpoint().toString(), partitionFormat);
+ Range<PartitionKey> reservedHistoryPartitionKeyRange =
getClosedRange(db, olapTable, partitionColumn, partitionFormat,
lowerBorderOfReservedHistory, upperBorderOfReservedHistory);
+
reservedHistoryPartitionKeyRangeList.add(reservedHistoryPartitionKeyRange);
+ } catch (IllegalArgumentException e) {
+ return dropPartitionClauses;
Review comment:
Add a log here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
