This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 0f31e9c0780 [fix](case) 1. rm the part of "test two phase commit" in
test_stream_load.groovy since the correspond feature is not merged, (#25610)
0f31e9c0780 is described below
commit 0f31e9c078052abcaa199e735d6fd535a66a4a38
Author: Dongyang Li <hello_step...@qq.com>
AuthorDate: Thu Oct 19 11:09:12 2023 +0800
[fix](case) 1. rm the part of "test two phase commit" in
test_stream_load.groovy since the correspond feature is not merged, (#25610)
---
.../load_p0/stream_load/test_stream_load.groovy | 138 ---------------------
.../test_select_with_predicate_prune.groovy | 6 +-
2 files changed, 5 insertions(+), 139 deletions(-)
diff --git a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
index 968c2e56108..d9cf9c72938 100644
--- a/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
+++ b/regression-test/suites/load_p0/stream_load/test_stream_load.groovy
@@ -943,143 +943,5 @@ suite("test_stream_load", "p0") {
assertEquals(res[0][0], 1)
assertEquals(res[1][0], 1)
- // test two phase commit
- def tableName15 = "test_two_phase_commit"
- InetSocketAddress address = context.config.feHttpInetSocketAddress
- String user = context.config.feHttpUser
- String password = context.config.feHttpPassword
- String db = context.config.getDbNameByFile(context.file)
-
- def do_streamload_2pc = { label, txn_operation ->
- HttpClients.createDefault().withCloseable { client ->
- RequestBuilder requestBuilder =
RequestBuilder.put("http://${address.hostString}:${address.port}/api/${db}/${tableName15}/_stream_load_2pc";)
- String encoding = Base64.getEncoder()
- .encodeToString((user + ":" + (password == null ? "" :
password)).getBytes("UTF-8"))
- requestBuilder.setHeader("Authorization", "Basic ${encoding}")
- requestBuilder.setHeader("Expect", "100-Continue")
- requestBuilder.setHeader("label", "${label}")
- requestBuilder.setHeader("txn_operation", "${txn_operation}")
-
- String backendStreamLoadUri = null
- client.execute(requestBuilder.build()).withCloseable { resp ->
- resp.withCloseable {
- String body = EntityUtils.toString(resp.getEntity())
- def respCode = resp.getStatusLine().getStatusCode()
- // should redirect to backend
- if (respCode != 307) {
- throw new IllegalStateException("Expect frontend
stream load response code is 307, " +
- "but meet ${respCode}\nbody: ${body}")
- }
- backendStreamLoadUri =
resp.getFirstHeader("location").getValue()
- }
- }
-
- requestBuilder.setUri(backendStreamLoadUri)
- try{
- client.execute(requestBuilder.build()).withCloseable { resp ->
- resp.withCloseable {
- String body = EntityUtils.toString(resp.getEntity())
- def respCode = resp.getStatusLine().getStatusCode()
- if (respCode != 200) {
- throw new IllegalStateException("Expect backend
stream load response code is 200, " +
- "but meet ${respCode}\nbody: ${body}")
- }
- }
- }
- } catch (Throwable t) {
- log.info("StreamLoad Exception: ", t)
- }
- }
- }
-
- try {
- sql """ DROP TABLE IF EXISTS ${tableName15} """
- sql """
- CREATE TABLE IF NOT EXISTS ${tableName15} (
- `k1` bigint(20) NULL DEFAULT "1",
- `k2` bigint(20) NULL ,
- `v1` tinyint(4) NULL,
- `v2` tinyint(4) NULL,
- `v3` tinyint(4) NULL,
- `v4` DATETIME NULL
- ) ENGINE=OLAP
- DISTRIBUTED BY HASH(`k1`) BUCKETS 3
- PROPERTIES ("replication_allocation" = "tag.location.default: 1");
- """
-
- def label = UUID.randomUUID().toString().replaceAll("-", "")
- streamLoad {
- table "${tableName15}"
-
- set 'label', "${label}"
- set 'column_separator', '|'
- set 'columns', 'k1, k2, v1, v2, v3'
- set 'two_phase_commit', 'true'
-
- file 'test_two_phase_commit.csv'
-
- check { result, exception, startTime, endTime ->
- if (exception != null) {
- throw exception
- }
- log.info("Stream load result: ${result}".toString())
- def json = parseJson(result)
- assertEquals("success", json.Status.toLowerCase())
- assertEquals(2, json.NumberTotalRows)
- assertEquals(0, json.NumberFilteredRows)
- assertEquals(0, json.NumberUnselectedRows)
- }
- }
-
- qt_sql_2pc "select * from ${tableName15} order by k1"
-
- do_streamload_2pc.call(label, "abort")
-
- qt_sql_2pc_abort "select * from ${tableName15} order by k1"
-
- streamLoad {
- table "${tableName15}"
-
- set 'label', "${label}"
- set 'column_separator', '|'
- set 'columns', 'k1, k2, v1, v2, v3'
- set 'two_phase_commit', 'true'
-
- file 'test_two_phase_commit.csv'
-
- check { result, exception, startTime, endTime ->
- if (exception != null) {
- throw exception
- }
- log.info("Stream load result: ${result}".toString())
- def json = parseJson(result)
- assertEquals("success", json.Status.toLowerCase())
- assertEquals(2, json.NumberTotalRows)
- assertEquals(0, json.NumberFilteredRows)
- assertEquals(0, json.NumberUnselectedRows)
- }
- }
-
- do_streamload_2pc.call(label, "commit")
-
- def count = 0
- while (true) {
- res = sql "select count(*) from ${tableName15}"
- if (res[0][0] > 0) {
- break
- }
- if (count >= 60) {
- log.error("stream load commit can not visible for long time")
- assertEquals(2, res[0][0])
- break
- }
- sleep(1000)
- count++
- }
-
- qt_sql_2pc_commit "select * from ${tableName15} order by k1"
- } finally {
- sql """ DROP TABLE IF EXISTS ${tableName15} FORCE"""
- }
}
diff --git
a/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
b/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
index 768e04b4c32..26410447080 100644
--- a/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
+++ b/regression-test/suites/query_p0/test_select_with_predicate_prune.groovy
@@ -25,7 +25,11 @@ suite("test_select_with_predicate_prune") {
birthday date not null
)
duplicate key(`id`)
- AUTO PARTITION BY LIST (`birthday`)()
+ PARTITION BY RANGE (`birthday`)(
+ PARTITION `p20201001` VALUES LESS THAN ("2020-10-02"),
+ PARTITION `p20201002` VALUES LESS THAN ("2020-10-03"),
+ PARTITION `p20201003` VALUES LESS THAN ("2020-10-04")
+ )
DISTRIBUTED BY HASH(`id`) buckets 1
PROPERTIES
(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
