This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2801fc243af Add more integration test case for sql federation (#21059)
2801fc243af is described below
commit 2801fc243af9d2d33a43776bb4b4d478623a25d6
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Mon Sep 19 20:50:22 2022 +0800
Add more integration test case for sql federation (#21059)
* Add more integration test case for sql federation
* Add more integration test case for sql federation
---
.../pipeline/core/importer/DataRecordMerger.java | 8 ++++----
.../cases/dql/dql-integration-test-cases.xml | 21 +++++++++------------
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
index eddcb12773b..e5e00b9fe38 100644
---
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
+++
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
@@ -88,8 +88,8 @@ public final class DataRecordMerger {
private void mergeInsert(final DataRecord dataRecord, final
Map<DataRecord.Key, DataRecord> dataRecords) {
DataRecord beforeDataRecord = dataRecords.get(dataRecord.getKey());
- ShardingSpherePreconditions.checkState(null == beforeDataRecord ||
IngestDataChangeType.DELETE.equals(beforeDataRecord.getType()),
- () -> new
PipelineUnexpectedDataRecordOrderException(beforeDataRecord, dataRecord));
+ ShardingSpherePreconditions.checkState(null == beforeDataRecord
+ ||
IngestDataChangeType.DELETE.equals(beforeDataRecord.getType()), () -> new
PipelineUnexpectedDataRecordOrderException(beforeDataRecord, dataRecord));
dataRecords.put(dataRecord.getKey(), dataRecord);
}
@@ -120,8 +120,8 @@ public final class DataRecordMerger {
private void mergeDelete(final DataRecord dataRecord, final
Map<DataRecord.Key, DataRecord> dataRecords) {
DataRecord beforeDataRecord = dataRecords.get(dataRecord.getKey());
- ShardingSpherePreconditions.checkState(null == beforeDataRecord ||
(!IngestDataChangeType.DELETE.equals(beforeDataRecord.getType())),
- () -> new
PipelineUnexpectedDataRecordOrderException(beforeDataRecord, dataRecord));
+ ShardingSpherePreconditions.checkState(null == beforeDataRecord
+ ||
(!IngestDataChangeType.DELETE.equals(beforeDataRecord.getType())), () -> new
PipelineUnexpectedDataRecordOrderException(beforeDataRecord, dataRecord));
if (null != beforeDataRecord &&
IngestDataChangeType.UPDATE.equals(beforeDataRecord.getType()) &&
checkUpdatedPrimaryKey(beforeDataRecord)) {
DataRecord mergedDataRecord = new
DataRecord(dataRecord.getPosition(), dataRecord.getColumnCount());
for (int i = 0; i < dataRecord.getColumnCount(); i++) {
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
index 83e82ff8167..f052bca4320 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/dql/dql-integration-test-cases.xml
@@ -518,10 +518,9 @@
<assertion expected-data-source-name="read_dataset" />
</test-case>
- <!--fixme! issue #9719-->
-<!-- <test-case sql="SELECT * FROM t_single_table s INNER JOIN t_order o ON
s.id = o.order_id" db-types="MySQL,Oracle,SQLServer"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting">-->
-<!-- <assertion expected-data-source-name="read_dataset" />-->
-<!-- </test-case>-->
+ <test-case sql="SELECT * FROM t_single_table s INNER JOIN t_order o ON
s.id = o.order_id" db-types="MySQL,Oracle,SQLServer"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting">
+ <assertion expected-data-source-name="read_dataset" />
+ </test-case>
<test-case sql="SELECT * FROM t_single_table s INNER JOIN t_user o ON s.id
= o.user_id" db-types="MySQL,Oracle,SQLServer"
scenario-types="encrypt,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
@@ -602,15 +601,13 @@
<test-case sql="SELECT o.item_id, o.order_id, o.creation_date, s.id FROM
t_order_item o INNER JOIN t_single_table s ON o.order_id = s.id ORDER BY
o.item_id " scenario-types="db,tbl" />
- <!-- FIXME #15592 Expected: is "1000", but: was "10000" -->
-<!-- <test-case sql="select t_order_federate.*,
t_order_item_federate_sharding.* from t_order_federate,
t_order_item_federate_sharding where t_order_federate.order_id =
t_order_item_federate_sharding.item_id AND
t_order_item_federate_sharding.remarks = 't_order_item_federate_sharding' "
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">-->
-<!-- <assertion expected-data-source-name="read_dataset" />-->
-<!-- </test-case>-->
+ <test-case sql="select t_order_federate.*,
t_order_item_federate_sharding.* from t_order_federate,
t_order_item_federate_sharding where t_order_federate.order_id =
t_order_item_federate_sharding.item_id AND
t_order_item_federate_sharding.remarks = 't_order_item_federate_sharding' "
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <assertion expected-data-source-name="read_dataset" />
+ </test-case>
- <!-- FIXME #15592 Expected: is "1000", but: was "10000" -->
-<!-- <test-case sql="select o.*, i.* from t_order_federate o,
t_order_item_federate_sharding i where o.order_id = i.item_id "
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">-->
-<!-- <assertion expected-data-source-name="read_dataset" />-->
-<!-- </test-case>-->
+ <test-case sql="select o.*, i.* from t_order_federate o,
t_order_item_federate_sharding i where o.order_id = i.item_id "
scenario-types="db,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <assertion expected-data-source-name="read_dataset" />
+ </test-case>
<test-case sql="SELECT * FROM (SELECT order_id_sharding, user_id FROM
t_order_federate_sharding WHERE order_id_sharding = 1010) AS TEMP"
scenario-types="db,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-source-name="read_dataset" />
