Skip to content

Commit

Permalink
This is an automated cherry-pick of pingcap#8671
Browse files Browse the repository at this point in the history
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
  • Loading branch information
SeaRise authored and ti-chi-bot committed Mar 4, 2024
1 parent 27494dc commit fc1f44f
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 2 deletions.
7 changes: 5 additions & 2 deletions dbms/src/Flash/Coprocessor/RemoteRequest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,11 @@ RemoteRequest RemoteRequest::build(
}
else
{
const auto & col_info = table_info.getColumnInfo(col_id);
schema.emplace_back(std::make_pair(col_info.name, col_info));
// https://github.com/pingcap/tiflash/issues/8601
// If the precision of the `TIME`(which is MyDuration in TiFlash) type is modified,
// TiFlash storage layer may not trigger `sync_schema` and update table info.
// Therefore, the column info in the TiDB request will be used in this case.
schema.emplace_back(std::make_pair(table_info.getColumnInfo(col_id).name, col));
}
dag_req.add_output_offsets(i);
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions tests/fullstack-test/issues/issue_7695.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Copyright 2023 PingCAP, Inc.
#
# Licensed 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.

include_directories (${CMAKE_CURRENT_BINARY_DIR})

set(SRCS )

add_executable (data_types_number_fixed data_types_number_fixed.cpp ${SRCS})
target_link_libraries (data_types_number_fixed dbms)

add_executable (data_type_string data_type_string.cpp ${SRCS})
target_link_libraries (data_type_string dbms)
File renamed without changes.
44 changes: 44 additions & 0 deletions tests/fullstack-test/issues/issue_8482.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Copyright 2023 PingCAP, Inc.
#
# Licensed 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.

mysql> drop table if exists test.t;
mysql> create table test.t(b json);
mysql> alter table test.t set tiflash replica 1;
mysql> insert into test.t values (true);

func> wait_table test t

mysql> set tidb_allow_mpp=1;set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select b = true from test.t;
+----------+
| b = true |
+----------+
| 0 |
+----------+

mysql> set tidb_allow_mpp=1;set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select b = 1 from test.t;
+-------+
| b = 1 |
+-------+
| 1 |
+-------+

mysql> set tidb_allow_mpp=1;set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select b = true, b = 1 from test.t;
+----------+-------+
| b = true | b = 1 |
+----------+-------+
| 0 | 1 |
+----------+-------+

# Clean up.
mysql> drop table if exists test.t;
72 changes: 72 additions & 0 deletions tests/fullstack-test/issues/issue_8601.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
# Copyright 2024 PingCAP, Inc.
#
# Licensed 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.

# Preparation.
=> DBGInvoke __init_fail_point()
=> DBGInvoke __enable_schema_sync_service('false')

mysql> drop table if exists test.t;
mysql> create table if not exists test.t(a time(4));

mysql> insert into test.t values('700:10:10.123456');
mysql> insert into test.t values('-700:10:10.123456');
mysql> alter table test.t set tiflash replica 1;
func> wait_table test t

## time(4) to time(6)
mysql> alter table test.t modify column a time(6);

mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select a from test.t;
+-------------------+
| a |
+-------------------+
| 700:10:10.123500 |
| -700:10:10.123500 |
+-------------------+

=> DBGInvoke __enable_fail_point(force_remote_read_for_batch_cop)
mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select a from test.t;
+-------------------+
| a |
+-------------------+
| 700:10:10.123500 |
| -700:10:10.123500 |
+-------------------+
=> DBGInvoke __disable_fail_point(force_remote_read_for_batch_cop)

## time(6) to time(2)
mysql> alter table test.t modify column a time(2);

mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select a from test.t;
+---------------+
| a |
+---------------+
| 700:10:10.12 |
| -700:10:10.12 |
+---------------+

=> DBGInvoke __enable_fail_point(force_remote_read_for_batch_cop)
mysql> use test; set tidb_enforce_mpp=1; set tidb_isolation_read_engines='tiflash'; select a from test.t;
+---------------+
| a |
+---------------+
| 700:10:10.12 |
| -700:10:10.12 |
+---------------+
=> DBGInvoke __disable_fail_point(force_remote_read_for_batch_cop)

# Clean up.
mysql> drop table if exists test.t

=> DBGInvoke __enable_schema_sync_service('true')

0 comments on commit fc1f44f

Please sign in to comment.