Skip to content

Commit 70574c7

Browse files
stelinstelin
authored
Merge pull request #728 from swoftcloud/master
Add dmeo
2 parents 8c7161d + 7ff0f5d commit 70574c7

11 files changed

+434
-21
lines changed

‎app/Common/DbSelector.php

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public function select(Connection $connection): void
2929
$selectIndex = '';
3030
}
3131

32+
if($createDbName == 'test2'){
33+
$createDbName = 'test';
34+
}
35+
3236
$dbName = sprintf('%s%s', $createDbName, (string)$selectIndex);
3337
$connection->db($dbName);
3438
}

‎app/Console/Command/TestCommand.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public function ab()
3737
}
3838

3939
foreach ($exeUris as $uri) {
40-
$abShell = sprintf('ab -k -n 10000 -k -c 2000 127.0.0.1:18306%s', $uri);
40+
$curlResult = null;
41+
$abShell = sprintf('ab -k -n 10000 -c 2000 127.0.0.1:18306%s', $uri);
4142
$curlShell = sprintf('curl 127.0.0.1:18306%s', $uri);
4243

4344
exec($curlShell, $curlResult);
@@ -71,6 +72,7 @@ private function uris(): array
7172
'/dbTransaction/ts2',
7273
'/dbTransaction/cm2',
7374
'/dbTransaction/rl2',
75+
'/dbTransaction/multiPool',
7476
'/dbModel/find',
7577
'/dbModel/update',
7678
'/dbModel/delete',

‎app/Http/Controller/DbModelController.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
use App\Model\Entity\User;
77
use Exception;
8+
use Swoft\Http\Message\Response;
89
use Swoft\Http\Server\Annotation\Mapping\Controller;
910
use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
1011
use Throwable;
@@ -21,16 +22,18 @@ class DbModelController
2122
/**
2223
* @RequestMapping(route="find")
2324
*
24-
* @return array
25+
* @param Response $response
26+
*
27+
* @return Response
2528
*
2629
* @throws Throwable
2730
*/
28-
public function find(): array
31+
public function find(Response $response): Response
2932
{
3033
$id = $this->getId();
3134
$user = User::find($id);
3235

33-
return $user->toArray();
36+
return $response->withData($user);
3437
}
3538

3639
/**

‎app/Http/Controller/DbTransactionController.php

+38
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
namespace App\Http\Controller;
55

6+
use App\Model\Entity\Count;
67
use App\Model\Entity\User;
8+
use App\Model\Entity\User3;
79
use Swoft\Db\DB;
810
use Swoft\Http\Server\Annotation\Mapping\Controller;
911
use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
@@ -153,6 +155,42 @@ public function rl2()
153155
return json_encode($user->toArray());
154156
}
155157

158+
/**
159+
* @RequestMapping()
160+
*/
161+
public function multiPool()
162+
{
163+
DB::beginTransaction();
164+
165+
// db3.pool
166+
$user = new User3();
167+
$user->setAge(mt_rand(1, 100));
168+
$user->setUserDesc('desc');
169+
170+
$user->save();
171+
$uid3 = $user->getId();
172+
173+
174+
//db.pool
175+
$uid = $this->getId();
176+
177+
$count = new Count();
178+
$count->setUserId(mt_rand(1, 100));
179+
$count->setAttributes('attr');
180+
$count->setCreateTime(time());
181+
182+
$count->save();
183+
$cid = $count->getId();
184+
185+
DB::rollBack();
186+
187+
$u3 = User3::find($uid3)->toArray();
188+
$u = User::find($uid);
189+
$c = Count::find($cid);
190+
191+
return [$u3, $u, $c];
192+
}
193+
156194
/**
157195
* @return int
158196
* @throws Throwable

‎app/Http/Controller/SelectDbController.php

+39-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
namespace App\Http\Controller;
55

6-
use App\Model\Entity\Count;
6+
use App\Model\Entity\Count2;
7+
use App\Model\Entity\Desc;
78
use App\Model\Entity\User;
89
use Exception;
10+
use ReflectionException;
11+
use Swoft\Bean\Exception\ContainerException;
912
use Swoft\Db\DB;
13+
use Swoft\Db\Exception\DbException;
1014
use Swoft\Http\Server\Annotation\Mapping\Controller;
1115
use Swoft\Http\Server\Annotation\Mapping\RequestMapping;
1216
use Throwable;
@@ -61,15 +65,18 @@ public function modelDb(): array
6165
$this->insertId2();
6266
$result = User::db('test2')->count('id');
6367

68+
$desc = $this->desc();
6469
sgo(function () {
6570
$id = $this->getId();
6671
User::find($id)->toArray();
6772

6873
$this->insertId2();
6974
User::db('test2')->count('id');
75+
76+
$this->desc();
7077
});
7178

72-
return [$user, $result];
79+
return [$user, $result, $desc];
7380
}
7481

7582
/**
@@ -115,6 +122,7 @@ public function queryDb(): array
115122

116123
$count = DB::table('user')->db('test2')->count();
117124

125+
$desc = $this->desc();
118126
sgo(function () {
119127
$id = $this->getId();
120128

@@ -123,9 +131,11 @@ public function queryDb(): array
123131
$this->insertId2();
124132

125133
DB::table('user')->db('test2')->count();
134+
135+
$this->desc();
126136
});
127137

128-
return [$user, $count];
138+
return [$user, $count, $desc];
129139
}
130140

131141
/**
@@ -166,14 +176,18 @@ public function dbDb(): array
166176

167177
$result = DB::db('test2')->selectOne('select * from user limit 1');
168178

179+
$desc = $this->desc();
180+
169181
sgo(function () {
170182
$id = $this->getId();
171183
User::find($id)->toArray();
172184

173185
DB::db('test2')->selectOne('select * from user limit 1');
186+
187+
$this->desc();
174188
});
175189

176-
return [$user, $result];
190+
return [$user, $result, $desc];
177191
}
178192

179193
/**
@@ -184,7 +198,7 @@ public function dbDb(): array
184198
*/
185199
public function select(): array
186200
{
187-
$count = new Count();
201+
$count = new Count2();
188202
$count->setUserId(mt_rand(1, 100));
189203
$count->setAttributes('attr');
190204
$count->setCreateTime(time());
@@ -194,6 +208,12 @@ public function select(): array
194208
return [$result, $count->getId()];
195209
}
196210

211+
/**
212+
* @return bool
213+
* @throws ContainerException
214+
* @throws DbException
215+
* @throws ReflectionException
216+
*/
197217
public function insertId2(): bool
198218
{
199219
$result = User::db('test2')->insert([
@@ -209,6 +229,20 @@ public function insertId2(): bool
209229
return $result;
210230
}
211231

232+
/**
233+
* @throws ReflectionException
234+
* @throws ContainerException
235+
* @throws DbException
236+
*/
237+
public function desc(): array
238+
{
239+
$desc = new Desc();
240+
$desc->setDesc("desc");
241+
$desc->save();
242+
243+
return Desc::find($desc->getId())->toArray();
244+
}
245+
212246
/**
213247
* @return int
214248
* @throws Throwable

‎app/Model/Entity/Count.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @since 2.0
1515
*
16-
* @Entity(table="count", pool="db2.pool")
16+
* @Entity(table="count")
1717
*/
1818
class Count extends Model
1919
{

‎app/Model/Entity/Count2.php

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
<?php declare(strict_types=1);
2+
3+
4+
namespace App\Model\Entity;
5+
6+
7+
use Swoft\Db\Annotation\Mapping\Column;
8+
use Swoft\Db\Annotation\Mapping\Entity;
9+
use Swoft\Db\Annotation\Mapping\Id;
10+
use Swoft\Db\Eloquent\Model;
11+
12+
/**
13+
* Class Count
14+
*
15+
* @since 2.0
16+
*
17+
* @Entity(table="count", pool="db2.pool")
18+
*/
19+
class Count2 extends Model
20+
{
21+
/**
22+
* @Id(incrementing=true)
23+
*
24+
* @Column(name="id", prop="id")
25+
* @var int|null
26+
*/
27+
private $id;
28+
29+
/**
30+
* @Column(name="user_id", prop="userId")
31+
* @var int|null
32+
*/
33+
private $userId;
34+
35+
/**
36+
* @Column(name="create_time", prop="createTime")
37+
*
38+
* @var int|null
39+
*/
40+
private $createTime;
41+
42+
/**
43+
* attributes
44+
*
45+
* @Column()
46+
*
47+
* @var string|null
48+
*/
49+
private $attributes;
50+
51+
/**
52+
* @return null|int
53+
*/
54+
public function getId(): ?int
55+
{
56+
return $this->id;
57+
}
58+
59+
/**
60+
* @param null|int $id
61+
*/
62+
public function setId(?int $id): void
63+
{
64+
$this->id = $id;
65+
}
66+
67+
/**
68+
* @return null|int
69+
*/
70+
public function getUserId(): ?int
71+
{
72+
return $this->userId;
73+
}
74+
75+
/**
76+
* @param null|int $userId
77+
*/
78+
public function setUserId(?int $userId): void
79+
{
80+
$this->userId = $userId;
81+
}
82+
83+
/**
84+
* @return null|int
85+
*/
86+
public function getCreateTime(): ?int
87+
{
88+
return $this->createTime;
89+
}
90+
91+
/**
92+
* @param null|int $createTime
93+
*/
94+
public function setCreateTime(?int $createTime): void
95+
{
96+
$this->createTime = $createTime;
97+
}
98+
99+
/**
100+
* @return null|string
101+
*/
102+
public function getAttributes(): ?string
103+
{
104+
return $this->attributes;
105+
}
106+
107+
/**
108+
* @param null|string $attributes
109+
*/
110+
public function setAttributes(?string $attributes): void
111+
{
112+
$this->attributes = $attributes;
113+
}
114+
}

0 commit comments

Comments
 (0)