This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 925074c0dfe [fix](merge-cloud) Disable memtable on sink node & unique
key merge on write (#30833)
925074c0dfe is described below
commit 925074c0dfe000f580028cb3f893f183a7c390e4
Author: walter <w41te...@gmail.com>
AuthorDate: Mon Feb 5 14:31:32 2024 +0800
[fix](merge-cloud) Disable memtable on sink node & unique key merge on
write (#30833)
In cloud mode, both features are not supported.
---
be/src/exec/data_sink.cpp | 6 +++++-
.../org/apache/doris/cloud/common/util/CloudPropertyAnalyzer.java | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp
index 5809912f4a2..aadc753da50 100644
--- a/be/src/exec/data_sink.cpp
+++ b/be/src/exec/data_sink.cpp
@@ -29,7 +29,7 @@
#include <ostream>
#include <string>
-#include "common/config.h"
+#include "cloud/config.h"
#include "runtime/query_context.h"
#include "runtime/query_statistics.h"
#include "vec/sink/async_writer_sink.h"
@@ -151,6 +151,10 @@ Status DataSink::create_data_sink(ObjectPool* pool, const
TDataSink& thrift_sink
DCHECK(thrift_sink.__isset.olap_table_sink);
if (state->query_options().enable_memtable_on_sink_node &&
!_has_inverted_index_or_partial_update(thrift_sink.olap_table_sink)) {
+ if (config::is_cloud_mode()) {
+ return Status::InternalError(
+ "memtable on sink node is not supported in cloud
mode");
+ }
sink->reset(new vectorized::VOlapTableSinkV2(pool, row_desc,
output_exprs));
} else {
sink->reset(new vectorized::VOlapTableSink(pool, row_desc,
output_exprs));
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/cloud/common/util/CloudPropertyAnalyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/cloud/common/util/CloudPropertyAnalyzer.java
index a63fbaa5f45..6706ef17c87 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/cloud/common/util/CloudPropertyAnalyzer.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/cloud/common/util/CloudPropertyAnalyzer.java
@@ -45,7 +45,9 @@ public class CloudPropertyAnalyzer extends PropertyAnalyzer {
RewriteProperty.replace(DynamicPartitionProperty.REPLICATION_NUM,
String.valueOf(ReplicaAllocation.DEFAULT_ALLOCATION.getTotalReplicaNum())),
RewriteProperty.replace(DynamicPartitionProperty.REPLICATION_ALLOCATION,
- ReplicaAllocation.DEFAULT_ALLOCATION.toCreateStmt())
+ ReplicaAllocation.DEFAULT_ALLOCATION.toCreateStmt()),
+ // FIXME: MOW is not supported in cloud mode yet.
+
RewriteProperty.replace(PropertyAnalyzer.ENABLE_UNIQUE_KEY_MERGE_ON_WRITE,
"false")
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
