hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'pr_1577'

Browse Source
This commit is contained in:
ob-robot
2023-11-01 05:10:57 +00:00
parent b5dcad8e1d 122b4835a9
commit f2b1db5f61
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/README.md
View File

@ -20,6 +20,6 @@ At present, the guide is composed of the following parts:
## User documents ## User documents
This guide does _not_ contains user documents. This guide does _not_ contain user documents.
For user documents, please refer to [oceanbase-doc](https://github.com/oceanbase/oceanbase-doc). For user documents, please refer to [oceanbase-doc](https://github.com/oceanbase/oceanbase-doc).

2
docs/build-and-run.md
View File

@ -30,7 +30,7 @@ bash build.sh release --init --make
## Run ## Run
Now that you built the `observer` binary, you can deploy a OceanBase instance with the `obd.sh` utility: Now that you built the `observer` binary, you can deploy an OceanBase instance with the `obd.sh` utility:
```shell ```shell
./tools/deploy/obd.sh prepare -p /tmp/obtest ./tools/deploy/obd.sh prepare -p /tmp/obtest

2
src/sql/dblink/ob_dblink_utils.h
View File

@ -164,7 +164,7 @@ private:
int64_t sys_var_reverse_info_buf_size_; int64_t sys_var_reverse_info_buf_size_;
common::ObArenaAllocator arena_alloc_; common::ObArenaAllocator arena_alloc_;
ObArray<common::sqlclient::ObCommonServerConnectionPool *> dblink_conn_pool_array_; //for dblink read to free connection when session drop. ObArray<common::sqlclient::ObCommonServerConnectionPool *> dblink_conn_pool_array_; //for dblink read to free connection when session drop.
ObArray<int64_t> dblink_conn_holder_array_; //for dblink write to hold connection during trasaction. ObArray<int64_t> dblink_conn_holder_array_; //for dblink write to hold connection during transaction.
ObString last_reverse_info_values_; ObString last_reverse_info_values_;
}; };

2
src/sql/engine/dml/ob_link_op.cpp
View File

@ -177,7 +177,7 @@ int ObLinkOp::init_dblink(uint64_t dblink_id, ObDbLinkProxy *dblink_proxy, bool
} else { } else {
dblink_conn_ = dblink_conn; dblink_conn_ = dblink_conn;
in_xa_trascaction_ = true; //to tell link scan op don't release dblink_conn_ in_xa_trascaction_ = true; //to tell link scan op don't release dblink_conn_
LOG_TRACE("link op get connection from xa trasaction", K(dblink_id), KP(dblink_conn_)); LOG_TRACE("link op get connection from xa transaction", K(dblink_id), KP(dblink_conn_));
} }
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
dblink_proxy_ = dblink_proxy; dblink_proxy_ = dblink_proxy;

2
src/sql/engine/dml/ob_link_op.h
View File

@ -90,7 +90,7 @@ protected:
int64_t next_sql_req_level_; int64_t next_sql_req_level_;
static const int64_t STMT_BUF_BLOCK; static const int64_t STMT_BUF_BLOCK;
common::sqlclient::DblinkDriverProto link_type_; common::sqlclient::DblinkDriverProto link_type_;
bool in_xa_trascaction_; // is dblink write/read remote database in xa trasaction bool in_xa_trascaction_; // is dblink write/read remote database in xa transaction
static const char * head_comment_fmt_; static const char * head_comment_fmt_;
static const int64_t head_comment_length_; static const int64_t head_comment_length_;
static const char *proxy_route_info_fmt_; static const char *proxy_route_info_fmt_;