database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Deny specify partition for unpartitioned table (#1319)

Browse Source
This commit is contained in:
ZHAO Chun
2019-06-15 18:19:56 +08:00
committed by Mingyu Chen
parent 9d03ba236b
commit 30028bc35b
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
be/src/exec/broker_scan_node.cpp
View File

@ -320,7 +320,11 @@ Status BrokerScanNode::scanner_scan(
continue;
}
if (scan_range.params.__isset.partition_ids) {
// The reason we check if partition_expr_ctxs is empty is when loading data to
// a unpartitioned table who has no partition_expr_ctxs, user can specify
// a partition name. And we check here to aovid this check and make our
// process run as normal
if (scan_range.params.__isset.partition_ids && !partition_expr_ctxs.empty()) {
int64_t partition_id = get_partition_id(partition_expr_ctxs, row);
if (partition_id == -1 ||
!std::binary_search(scan_range.params.partition_ids.begin(),

7
fe/src/main/java/org/apache/doris/load/Load.java
View File

@ -667,6 +667,13 @@ public class Load {
throw new DdlException("Table [" + tableName + "] is not olap table");
}
// check partition
if (dataDescription.getPartitionNames() != null &&
!dataDescription.getPartitionNames().isEmpty() &&
((OlapTable) table).getPartitionInfo().getType() == PartitionType.UNPARTITIONED) {
ErrorReport.reportDdlException(ErrorCode.ERR_PARTITION_CLAUSE_NO_ALLOWED);
}
if (((OlapTable) table).getState() == OlapTableState.RESTORE) {
throw new DdlException("Table [" + tableName + "] is under restore");
}