-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bugfix](external)Memory leak problem for external table with insert …
…operation (#40440) ## Proposed changes Get the corresponding transaction through `txnId`, and then update the file list returned from be according to the transaction.
- Loading branch information
Showing
14 changed files
with
163 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
81 changes: 81 additions & 0 deletions
81
...e-core/src/main/java/org/apache/doris/transaction/AbstractExternalTransactionManager.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.transaction; | ||
|
|
||
| import org.apache.doris.catalog.Env; | ||
| import org.apache.doris.common.UserException; | ||
| import org.apache.doris.datasource.operations.ExternalMetadataOps; | ||
|
|
||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| public abstract class AbstractExternalTransactionManager<T extends Transaction> implements TransactionManager { | ||
| private static final Logger LOG = LogManager.getLogger(AbstractExternalTransactionManager.class); | ||
| private final Map<Long, T> transactions = new ConcurrentHashMap<>(); | ||
| protected final ExternalMetadataOps ops; | ||
|
|
||
| public AbstractExternalTransactionManager(ExternalMetadataOps ops) { | ||
| this.ops = ops; | ||
| } | ||
|
|
||
| abstract T createTransaction(); | ||
|
|
||
| @Override | ||
| public long begin() { | ||
| long id = Env.getCurrentEnv().getNextId(); | ||
| T transaction = createTransaction(); | ||
| transactions.put(id, transaction); | ||
| Env.getCurrentEnv().getGlobalExternalTransactionInfoMgr().putTxnById(id, transaction); | ||
| return id; | ||
| } | ||
|
|
||
| @Override | ||
| public void commit(long id) throws UserException { | ||
| getTransactionWithException(id).commit(); | ||
| transactions.remove(id); | ||
| Env.getCurrentEnv().getGlobalExternalTransactionInfoMgr().removeTxnById(id); | ||
| } | ||
|
|
||
| @Override | ||
| public void rollback(long id) { | ||
| try { | ||
| getTransactionWithException(id).rollback(); | ||
| } catch (TransactionNotFoundException e) { | ||
| LOG.warn(e.getMessage(), e); | ||
| } finally { | ||
| transactions.remove(id); | ||
| Env.getCurrentEnv().getGlobalExternalTransactionInfoMgr().removeTxnById(id); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Transaction getTransaction(long id) throws UserException { | ||
| return getTransactionWithException(id); | ||
| } | ||
|
|
||
| private Transaction getTransactionWithException(long id) throws TransactionNotFoundException { | ||
| Transaction txn = transactions.get(id); | ||
| if (txn == null) { | ||
| throw new TransactionNotFoundException("Can't find transaction for " + id); | ||
| } | ||
| return txn; | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalExternalTransactionInfoMgr.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| package org.apache.doris.transaction; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| public class GlobalExternalTransactionInfoMgr { | ||
| public Map<Long, Transaction> idToTxn = new ConcurrentHashMap<>(); | ||
|
|
||
| public Transaction getTxnById(long txnId) { | ||
| if (idToTxn.containsKey(txnId)) { | ||
| return idToTxn.get(txnId); | ||
| } | ||
| throw new RuntimeException("Can't find txn for " + txnId); | ||
| } | ||
|
|
||
| public void putTxnById(long txnId, Transaction txn) { | ||
| if (idToTxn.containsKey(txnId)) { | ||
| throw new RuntimeException("Duplicate txnId for " + txnId); | ||
| } | ||
| idToTxn.put(txnId, txn); | ||
| } | ||
|
|
||
| public void removeTxnById(long txnId) { | ||
| idToTxn.remove(txnId); | ||
| } | ||
| } |
Oops, something went wrong.