Skip to content

branch-4.1:[feature](maxcompute) supplement missing writer auth pick from #60649 #61717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hubgeter wants to merge 1 commit into
base: branch-4.1
Choose a base branch
from
Open

branch-4.1:[feature](maxcompute) supplement missing writer auth pick from #60649 #61717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions be/src/exec/sink/writer/maxcompute/vmc_table_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,7 @@ Status VMCTableWriter::open(RuntimeState* state, RuntimeProfile* profile) {
}

std::map<std::string, std::string> VMCTableWriter::_build_base_writer_params() {
std::map<std::string, std::string> params;
if (_mc_sink.__isset.access_key) params["access_key"] = _mc_sink.access_key;
if (_mc_sink.__isset.secret_key) params["secret_key"] = _mc_sink.secret_key;
auto params = _mc_sink.properties;
if (_mc_sink.__isset.endpoint) params["endpoint"] = _mc_sink.endpoint;
if (_mc_sink.__isset.project) params["project"] = _mc_sink.project;
if (_mc_sink.__isset.table_name) params["table"] = _mc_sink.table_name;
Expand Down
2 changes: 1 addition & 1 deletion ...max-compute-connector/src/main/java/org/apache/doris/maxcompute/MaxComputeJniScanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ private enum SplitType {
private TableBatchReadSession scan;
public String sessionId;

private String project; //final ???
private String project;
private String table;

private SplitReader<VectorSchemaRoot> currentSplitReader;
Expand Down
12 changes: 4 additions & 8 deletions .../max-compute-connector/src/main/java/org/apache/doris/maxcompute/MaxComputeJniWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@

import org.apache.doris.common.jni.JniWriter;
import org.apache.doris.common.jni.vec.VectorTable;
import org.apache.doris.common.maxcompute.MCUtils;

import com.aliyun.odps.Odps;
import com.aliyun.odps.OdpsType;
import com.aliyun.odps.account.Account;
import com.aliyun.odps.account.AliyunAccount;
import com.aliyun.odps.table.configuration.ArrowOptions;
import com.aliyun.odps.table.configuration.ArrowOptions.TimestampUnit;
import com.aliyun.odps.table.configuration.RestOptions;
Expand Down Expand Up @@ -94,8 +93,7 @@ public class MaxComputeJniWriter extends JniWriter {
private static final String READ_TIMEOUT = "read_timeout";
private static final String RETRY_COUNT = "retry_count";

private final String accessKey;
private final String secretKey;
private final Map<String, String> params;
private final String endpoint;
private final String project;
private final String tableName;
Expand All @@ -121,8 +119,7 @@ public class MaxComputeJniWriter extends JniWriter {

public MaxComputeJniWriter(int batchSize, Map<String, String> params) {
super(batchSize, params);
this.accessKey = Objects.requireNonNull(params.get(ACCESS_KEY), "required property '" + ACCESS_KEY + "'.");
this.secretKey = Objects.requireNonNull(params.get(SECRET_KEY), "required property '" + SECRET_KEY + "'.");
this.params = params;
this.endpoint = Objects.requireNonNull(params.get(ENDPOINT), "required property '" + ENDPOINT + "'.");
this.project = Objects.requireNonNull(params.get(PROJECT), "required property '" + PROJECT + "'.");
this.tableName = Objects.requireNonNull(params.get(TABLE), "required property '" + TABLE + "'.");
Expand All @@ -139,8 +136,7 @@ public MaxComputeJniWriter(int batchSize, Map<String, String> params) {
@Override
public void open() throws IOException {
try {
Account account = new AliyunAccount(accessKey, secretKey);
Odps odps = new Odps(account);
Odps odps = MCUtils.createMcClient(params);
odps.setDefaultProject(project);
odps.setEndpoint(endpoint);

Expand Down
Loading