Skip to content
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.

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

code refine && several minor bug fix #174

Merged
merged 32 commits into from
Aug 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
71c09fb
fix cop test regression
windtalker Aug 6, 2019
6b8a054
address comments
windtalker Aug 6, 2019
6f32efd
format code
windtalker Aug 6, 2019
11b3e09
fix npe for dag execute
windtalker Aug 6, 2019
64fef5c
Merge branch 'cop' of https://github.com/pingcap/tics into cop
windtalker Aug 6, 2019
f96fcf4
format code
windtalker Aug 6, 2019
324b64d
address comment
windtalker Aug 6, 2019
6b06122
add some comments
windtalker Aug 6, 2019
2327e9f
throw exception when meet error duing cop request handling
windtalker Aug 6, 2019
72d11ad
Merge branch 'cop' of https://github.com/pingcap/tics into cop
windtalker Aug 6, 2019
428459a
Merge branch 'cop' of https://github.com/pingcap/tics into cop
windtalker Aug 7, 2019
f3eb6e5
address comments
windtalker Aug 7, 2019
d8bb7d9
add error code
windtalker Aug 7, 2019
b6eaa3b
throw exception when meet error duing cop request handling
windtalker Aug 7, 2019
fe7916e
address comments
windtalker Aug 7, 2019
f1d0bfe
add DAGContext so InterpreterDAG can exchange information with DAGDriver
windtalker Aug 8, 2019
dde6dab
merge pingcap/tics cop
windtalker Aug 8, 2019
3c29365
fix bug
windtalker Aug 8, 2019
b984cb6
1. refine code, 2. address comments
windtalker Aug 8, 2019
ddf64e6
update comments
windtalker Aug 8, 2019
d9c4a0d
columnref index is based on executor output schema
windtalker Aug 8, 2019
947606a
merge pingcap/tics cop
windtalker Aug 8, 2019
85ae8b9
Merge branch 'cop' of https://github.com/pingcap/tics into cop
windtalker Aug 9, 2019
aea80d6
handle error in coprocessor request
windtalker Aug 9, 2019
2ed69ef
merge pingcap/tics cop
windtalker Aug 9, 2019
353a2b1
refine code
windtalker Aug 9, 2019
f406893
use Clear to clear a protobuf message completely
windtalker Aug 9, 2019
021e4c3
refine code
windtalker Aug 12, 2019
8994597
code refine && several minor bug fix
windtalker Aug 12, 2019
f959a9e
Merge branch 'cop' of https://github.com/pingcap/tics into cop
windtalker Aug 12, 2019
1550ede
address comments
windtalker Aug 12, 2019
7336bea
address comments
windtalker Aug 12, 2019
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
Prev Previous commit
Next Next commit
use Clear to clear a protobuf message completely
windtalker committed Aug 9, 2019
commit f4068933605bab2630c19e30cb0e75b786ee1603
3 changes: 1 addition & 2 deletions dbms/src/Flash/Coprocessor/DAGDriver.cpp
Original file line number Diff line number Diff line change
@@ -107,8 +107,7 @@ catch (const std::exception & e)

void DAGDriver::recordError(Int32 err_code, const String & err_msg)
{
dag_response.clear_chunks();
dag_response.clear_execution_summaries();
dag_response.Clear();
tipb::Error * error = dag_response.mutable_error();
error->set_code(err_code);
error->set_msg(err_msg);
8 changes: 4 additions & 4 deletions dbms/src/Flash/FlashService.cpp
Original file line number Diff line number Diff line change
@@ -64,7 +64,7 @@ grpc::Status FlashService::Coprocessor(
catch (const LockException & e)
{
LOG_ERROR(log, __PRETTY_FUNCTION__ << ": LockException: " << e.displayText());
response->clear_data();
response->Clear();
kvrpcpb::LockInfo * lock_info = response->mutable_locked();
lock_info->set_key(e.lock_infos[0]->key);
lock_info->set_primary_lock(e.lock_infos[0]->primary_lock);
@@ -75,7 +75,7 @@ grpc::Status FlashService::Coprocessor(
catch (const RegionException & e)
{
LOG_ERROR(log, __PRETTY_FUNCTION__ << ": RegionException: " << e.displayText());
response->clear_data();
response->Clear();
errorpb::Error * region_err;
switch (e.status)
{
@@ -97,7 +97,7 @@ grpc::Status FlashService::Coprocessor(
catch (const Exception & e)
{
LOG_ERROR(log, __PRETTY_FUNCTION__ << ": Exception: " << e.displayText());
response->clear_data();
response->Clear();
response->set_other_error(e.message());

if (e.code() == ErrorCodes::NOT_IMPLEMENTED)
@@ -110,7 +110,7 @@ grpc::Status FlashService::Coprocessor(
catch (const std::exception & e)
{
LOG_ERROR(log, __PRETTY_FUNCTION__ << ": Exception: " << e.what());
response->clear_data();
response->Clear();
response->set_other_error(e.what());
return ::grpc::Status(::grpc::StatusCode::INTERNAL, e.what());
}