This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 32c6f5f905 [opt](test) set longer timeout for hive query cache test
case (#24569)
32c6f5f905 is described below
commit 32c6f5f9055d61de89ab15794a95792e387a7226
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Tue Sep 19 22:25:18 2023 +0800
[opt](test) set longer timeout for hive query cache test case (#24569)
Sometimes the first run of query may be longer then former given threshold,
which case test fail.
Also add a new session variable test_query_cache_hit
So that we can use it to test if cache is hit in regression test
---
.../java/org/apache/doris/qe/SessionVariable.java | 9 +
.../java/org/apache/doris/qe/StmtExecutor.java | 11 +-
.../org/apache/doris/qe/cache/CacheAnalyzer.java | 7 +-
.../java/org/apache/doris/qe/cache/SqlCache.java | 1 +
.../hive/test_hive_query_cache.out | 236 ++-------------------
.../hive/test_hive_query_cache.groovy | 47 ++--
6 files changed, 81 insertions(+), 230 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 1cc43c8dc4..4044c3e0e0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -411,6 +411,8 @@ public class SessionVariable implements Serializable,
Writable {
public static final String EXPAND_RUNTIME_FILTER_BY_INNER_JION =
"expand_runtime_filter_by_inner_join";
+ public static final String TEST_QUERY_CACHE_HIT = "test_query_cache_hit";
+
public static final List<String> DEBUG_VARIABLES = ImmutableList.of(
SKIP_DELETE_PREDICATE,
SKIP_DELETE_BITMAP,
@@ -1207,6 +1209,13 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = ENABLE_UNIQUE_KEY_PARTIAL_UPDATE, needForward
= false)
public boolean enableUniqueKeyPartialUpdate = false;
+ @VariableMgr.VarAttr(name = TEST_QUERY_CACHE_HIT, description = {
+ "用于测试查询缓存是否命中，如果未命中指定类型的缓存，则会报错",
+ "Used to test whether the query cache is hit. "
+ + "If the specified type of cache is not hit, an error
will be reported."},
+ options = {"none", "sql_cache", "partition_cache"})
+ public String testQueryCacheHit = "none";
+
// If this fe is in fuzzy mode, then will use initFuzzyModeVariables to
generate some variables,
// not the default value set in the code.
public void initFuzzyModeVariables() {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
index 1a7a2e674d..ecedfa3aa2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
@@ -1300,6 +1300,14 @@ public class StmtExecutor {
private void handleCacheStmt(CacheAnalyzer cacheAnalyzer, MysqlChannel
channel)
throws Exception {
InternalService.PFetchCacheResult cacheResult =
cacheAnalyzer.getCacheData();
+ if (cacheResult == null) {
+ if (ConnectContext.get() != null
+ &&
!ConnectContext.get().getSessionVariable().testQueryCacheHit.equals("none")) {
+ throw new UserException("The variable test_query_cache_hit is
set to "
+ +
ConnectContext.get().getSessionVariable().testQueryCacheHit
+ + ", but the query cache is not hit.");
+ }
+ }
CacheMode mode = cacheAnalyzer.getCacheMode();
Queriable queryStmt = (Queriable) parsedStmt;
boolean isSendFields = false;
@@ -1443,7 +1451,7 @@ public class StmtExecutor {
profile.getSummaryProfile().freshFetchResultConsumeTime();
// for outfile query, there will be only one empty batch send
back with eos flag
- // call `copyRowBatch()` first, because batch.getBatch() may
be null, it result set is empty
+ // call `copyRowBatch()` first, because batch.getBatch() may
be null, if result set is empty
if (cacheAnalyzer != null && !isOutfileQuery) {
cacheAnalyzer.copyRowBatch(batch);
}
@@ -2693,3 +2701,4 @@ public class StmtExecutor {
}
}
+
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
index 7ce85a5c25..981b95c759 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/CacheAnalyzer.java
@@ -38,6 +38,7 @@ import org.apache.doris.catalog.TableIf;
import org.apache.doris.catalog.View;
import org.apache.doris.common.Config;
import org.apache.doris.common.Status;
+import org.apache.doris.common.UserException;
import org.apache.doris.common.util.DebugUtil;
import org.apache.doris.metric.MetricRepo;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
@@ -369,6 +370,7 @@ public class CacheAnalyzer {
if (now == 0) {
now = nowtime();
}
+
if (enableSqlCache()
&& (now - latestTable.latestTime) >=
Config.cache_last_version_interval_second * 1000L) {
if (LOG.isDebugEnabled()) {
@@ -376,7 +378,7 @@ public class CacheAnalyzer {
Config.cache_last_version_interval_second * 1000);
}
cache = new SqlCache(this.queryId, ((LogicalPlanAdapter)
parsedStmt).getStatementContext()
- .getOriginStatement().originStmt);
+ .getOriginStatement().originStmt);
((SqlCache) cache).setCacheInfo(this.latestTable,
allViewExpandStmtListStr);
MetricRepo.COUNTER_CACHE_ADDED_SQL.increase(1L);
return CacheMode.Sql;
@@ -423,7 +425,7 @@ public class CacheAnalyzer {
return tblTimeList;
}
- public InternalService.PFetchCacheResult getCacheData() {
+ public InternalService.PFetchCacheResult getCacheData() throws
UserException {
if (parsedStmt instanceof LogicalPlanAdapter) {
cacheMode = innerCheckCacheModeForNereids(0);
} else if (parsedStmt instanceof SelectStmt) {
@@ -665,3 +667,4 @@ public class CacheAnalyzer {
cache.updateCache();
}
}
+
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/SqlCache.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/SqlCache.java
index 9135b453c6..536a507ba2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/cache/SqlCache.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/cache/SqlCache.java
@@ -117,3 +117,4 @@ public class SqlCache extends Cache {
}
}
}
+
diff --git
a/regression-test/data/external_table_p0/hive/test_hive_query_cache.out
b/regression-test/data/external_table_p0/hive/test_hive_query_cache.out
index 1320eb9bd5..2ffe3fb0c4 100644
--- a/regression-test/data/external_table_p0/hive/test_hive_query_cache.out
+++ b/regression-test/data/external_table_p0/hive/test_hive_query_cache.out
@@ -176,215 +176,19 @@ VIETNAM 1994 47729256.3324
VIETNAM 1993 45352676.8672
VIETNAM 1992 47846355.6485
--- !q24 --
-zhangsan 1
-lisi 1
-
--- !q25 --
-1 1
-2 1
-3 1
-4 1
-
--- !q26 --
-123 china 4 56 sc
-234 america 5 67 ls
-345 cana 4 56 fy
-567 fre 7 89 pa
-
--- !q27 --
-p_partkey2 p_name2 p_mfgr2 p_brand2 p_type2 p_size2 p_con2
p_r_price2 p_comment2
-p_partkey1 p_name1 p_mfgr1 p_brand1 p_type1 p_size1 p_con1
p_r_price1 p_comment1
-p_partkey0 p_name0 p_mfgr0 p_brand0 p_type0 p_size0 p_con0
p_r_price0 p_comment0
-
--- !q28 --
-batchno appsheet_no filedate t_no tano t_name
chged_no mob_no2 home_no off_no
-off_no home_no mob_no2 chged_no t_name tano t_no filedate
appsheet_no batchno
-
--- !q29 --
-bill_code dates ord_year ord_month ord_quarter on_time
-
--- !q30 --
-2
-
--- !q31 --
-123 zhangsan 12 123.45 2022-01-01
-124 lisi 12 123.45 2022-01-01
-125 lisan 12 123.45 2022-01-02
-
--- !q32 --
-a123 12
-a124 13
-a125 14
-a126 15
-
--- !q33 --
-2022-11-25 zz08Quhrpk zz08Quhrpk m8vknqtybC Eyk5GmwzDJ
eW7R46dTNx 86tM8PWfGQ RU6WOEYEmX eN0Sm0fEjH NwYXON812A
NYzAKjdBVu OQf936VCQv scbCva79DG HAK0HACy2d pbs5ypY6cy
ft54SbxPmW hcVLijY8PL 2022-11-25
-2022-11-25 zvyprEdKlk zvyprEdKlk 6oO1KfWKnS zeNgOLbD5I
o5FEyMNjhJ ACUBOltRRn YJsyP7erIV cZEbgd4Q7J DNzXA9QYKg
wrhu8Heu17 PHerHoPGn0 nSSQLodYNZ zSxZ7eEs1k V4RVLp7h2O
FGlZiPTOkV Yr1zRnrqPE 2022-11-25
-2022-11-25 ztbynIKOAB ztbynIKOAB T0jxzYQdtB sMyKhrS29F
tOKKw4YrnE ND0qk9uKlp f7fMtT4f9A XBKdWFhCc2 0AP0jCcOvc
Be2o2BO7Zf I33L9Tgr7y PG414ZCN0H Wb85Gn6HSE 6Dv3a7gAP1
abfib4AMr1 QX4rLkftjB 2022-11-25
-2022-11-25 zt6cI3WyPZ zt6cI3WyPZ FE3oLtL07b MqkD7rhh9Z
larXyucEGE piaxKcubhh cVUtgHlsly fjumWOXPkM hUNrdq0FYN
tsjzXqGBlN XNVuUkuoxG iyhpIB4SHv PTw9fDpPMm Url7haQqHQ
qWt4vJm87n FScyOLzx8c 2022-11-25
-2022-11-25 zluC6EgPz8 zluC6EgPz8 ufSllWR5MA XIcWrCHYsR
x4TQaY0uON AIRP6WN0PR sJ2hpxX6w4 aA4cNryz5G mAFcXmzyHG
VlVY1J6HSG 3HwdoY0t44 0nCMGUzzew RMsQ4tG9l4 BBKNamSAyP
8kRynkgB2y aqmC8elovV 2022-11-25
-2022-11-25 zjM4h9Jtm2 zjM4h9Jtm2 TgiVg53a5R qUqbrdFemU
0o7oL6FnQw h39e3fhRi2 erJgos6ENS xD8kdyZsIr VJ1GmDyO1F
QVbYI0NQ77 nrYkLCTrgD nQTn0hULEP qSHhNxO9AJ px5lKNCjrE
LyH73bHlJt KZSopyFVMm 2022-11-25
-2022-11-25 zgZ82sWMOE zgZ82sWMOE d3L50SOM47 xtRhjoeVNV
ZEWRyMclGd mE85T2Mg2t exZ7tYRdkr 6U4qNiFxDk VNTnrXhxC7
Rkfbo2rKY7 IoqxH43Iu1 13up4RtCbZ mbJgDA56Ey 9H7UGVuWCn
KvsB4cMCWZ FmICYOQC6Y 2022-11-25
-2022-11-25 zgUDwoe0R0 zgUDwoe0R0 VFqYUAJger Axv5zHQ9Aj
VrZj2oLMHw AFGrr1jQ4T dTaSKfBDyt lx1JgWEnVD Arqdl5tEB0
KSOTAtif2o TYuyIlLcDT 14vUoFChqv NM8pWxCiJL 1yZ7RM8WCs
9lYAarGdHK XsZ9vSH14w 2022-11-25
-2022-11-25 zYco1C1wbA zYco1C1wbA Jg9d1Vz8Nc M0jPS30f17
WRrQGzaqzl wKghuTj9Hf oAbqV68KVL iwT59HVsml X2pfKlSvmV
EtScW6rT7w fgSAM7qInL 7ud6VtTvNq pyP4ZGsJ5O 0mBO3GVgxc
j5ZKwj1MD5 VC7d7CEtco 2022-11-25
-2022-11-25 zUCfrwLP3h zUCfrwLP3h kqwtMmz3PH q1RgmOdoHv
ENU2ipUkUY IviUi4Gmrv R6LXapRkKZ vESQ05cSlQ ICw4lJ4ksT
bv0SQBAllD skdJMJYRKz ozPmYA3bks 3VSTEExqgk O9wf7u00RS
KQcf7rwCg5 K2EMmTiSSz 2022-11-25
-
--- !q34 --
-2022-11-24 zVhHON3m5L
-2022-11-24 zceLX7IpL5
-2022-11-24 zjp4CiDZ8F
-2022-11-24 zpV3iiPrMp
-2022-11-24 zrjCNYBzpb
-2022-11-24 zvbIuF1cg8
-2022-11-24 zyLjAtVdXV
-2022-11-25 zVOQFPxGhP
-2022-11-25 zj9uWRywHa
-2022-11-25 zvs3b72ERY
-
--- !q35 --
-2022-11-24 zyLjAtVdXV
-2022-11-24 zvbIuF1cg8
-2022-11-24 zrjCNYBzpb
-2022-11-24 zpV3iiPrMp
-2022-11-24 zjp4CiDZ8F
-2022-11-24 zceLX7IpL5
-2022-11-24 zVhHON3m5L
-2022-11-24 zTOGIjaaZJ
-2022-11-24 zOeOJwAvfc
-2022-11-24 zNDyH7VSpm
-
--- !q36 --
-zvs3b72ERY zorbigHkYB
-zj9uWRywHa 5F8hzYcY8G
-zVOQFPxGhP V0FTqkqsma
-zJvBmGUvxj oHlH8nOlxp
-zHUd303J4r q000anXrEp
-zGQt4RNefu 7fkTAaRATj
-z5SAncObhE PUl5h9h6iL
-z5AAgk7RGE gSPjanitfl
-z3cvap67Lh 8EfHi4roEB
-ysw8j0x551 IwlRuhywtn
-
--- !q37 --
-2000
-
--- !q38 --
-zvs3b72ERY zorbigHkYB
-zj9uWRywHa 5F8hzYcY8G
-zVOQFPxGhP V0FTqkqsma
-zJvBmGUvxj oHlH8nOlxp
-zHUd303J4r q000anXrEp
-zGQt4RNefu 7fkTAaRATj
-z5SAncObhE PUl5h9h6iL
-z5AAgk7RGE gSPjanitfl
-z3cvap67Lh 8EfHi4roEB
-ysw8j0x551 IwlRuhywtn
-
--- !q39 --
-zyLjAtVdXV GrJRf8WvRR
-zvs3b72ERY zorbigHkYB
-zvbIuF1cg8 33ZkOc8Fl7
-zrjCNYBzpb FD1Zxm39qk
-zpV3iiPrMp j0XRD1oFXY
-zjp4CiDZ8F ljiRxP16r2
-zj9uWRywHa 5F8hzYcY8G
-zceLX7IpL5 JZtsmIjKGQ
-zVhHON3m5L ecmOZhvo5C
-zVOQFPxGhP V0FTqkqsma
-
--- !q40 --
-2022-11-25 2022-11-25 zvs3b72ERY zorbigHkYB 2022-11-25
-2022-11-25 2022-11-25 zj9uWRywHa 5F8hzYcY8G 2022-11-25
-2022-11-25 2022-11-25 zVOQFPxGhP V0FTqkqsma 2022-11-25
-2022-11-25 2022-11-25 zJvBmGUvxj oHlH8nOlxp 2022-11-25
-2022-11-25 2022-11-25 zHUd303J4r q000anXrEp 2022-11-25
-2022-11-25 2022-11-25 zGQt4RNefu 7fkTAaRATj 2022-11-25
-2022-11-25 2022-11-25 z5SAncObhE PUl5h9h6iL 2022-11-25
-2022-11-25 2022-11-25 z5AAgk7RGE gSPjanitfl 2022-11-25
-2022-11-25 2022-11-25 z3cvap67Lh 8EfHi4roEB 2022-11-25
-2022-11-25 2022-11-25 ysw8j0x551 IwlRuhywtn 2022-11-25
-
--- !q41 --
-
--- !q42 --
-2022-11-24 2022-11-24 zyLjAtVdXV GrJRf8WvRR 2022-11-24
-2022-11-25 2022-11-25 zvs3b72ERY zorbigHkYB 2022-11-25
-2022-11-24 2022-11-24 zvbIuF1cg8 33ZkOc8Fl7 2022-11-24
-2022-11-24 2022-11-24 zrjCNYBzpb FD1Zxm39qk 2022-11-24
-2022-11-24 2022-11-24 zpV3iiPrMp j0XRD1oFXY 2022-11-24
-2022-11-24 2022-11-24 zjp4CiDZ8F ljiRxP16r2 2022-11-24
-2022-11-25 2022-11-25 zj9uWRywHa 5F8hzYcY8G 2022-11-25
-2022-11-24 2022-11-24 zceLX7IpL5 JZtsmIjKGQ 2022-11-24
-2022-11-24 2022-11-24 zVhHON3m5L ecmOZhvo5C 2022-11-24
-2022-11-25 2022-11-25 zVOQFPxGhP V0FTqkqsma 2022-11-25
-
--- !q43 --
-2022-11-10 zzf0Hyy3PP zzf0Hyy3PP kqonrn13oM qMpDJZ3jVG
oQafAQzfpg WprPRT9pxG W6Vfvw6VU3 U2J2db3EcI oa3CXQ51wk
DSfnG13L1h x6pO2DvZXm y6McEKEtPF 6P1xAKaJcI a0WviK01l1
4UxX1EJ4nV FAJyYIGlBN 2022-11-10
-2022-11-10 zwkeNflkF1 zwkeNflkF1 TkWqg6Ix6t Mvg3XCz4KW
xNtobuEiYh 2zfFFtguoD dM0xJvckpt J0KzHbhdQV GzofYnr0OQ
IDej5DPSlV QlzwIZHnDh oTrJx4aX3J Z1fyagW29j giFWZDk1Rd
CMHyNvI6n1 uXoAudfOjF 2022-11-10
-2022-11-10 zw7iBPPTEF zw7iBPPTEF z036dLkobV soKogHEGDn
htmRKThWKo WzPFReXEDF rx1wJaZkHR bGNyBl0jZc 41zilEUfud
fhVJ30rOBV VGgO3KrN3C c9KX0k1gb8 MwR4IXvjCI qrvDKvMD9k
mSqAiJQFEN hVuhJxSlj9 2022-11-10
-2022-11-10 zsLnfKZ51O zsLnfKZ51O wHvRoX5XhH 1lLcmzAVUU
VdRNvndgvg UoqeV9QYiJ pvSwfhZTej rA51Wq2lQN Ljdu8nmKCg
v9EMT2z3mo kKUH8y5N4u XoC9shDIZN GnJ5kOqIU3 ppQBteeHzM
3fn0IUEII1 tnzPWN4kRj 2022-11-10
-2022-11-10 zsEmkJnMdC zsEmkJnMdC Dx6sAB4I7M eCKoLNz9oG
lE3YGayXaN pGOgX608Fz pVo9dletTZ 7XWdPnNlJm seYFng9MgQ
PGD3yh4Wlc PfwzK2ZiuS l8ddKEdG8n AVLIoP9Jha ipjmF2YjKK
qaODuhuFWi AkuaGy0Qqp 2022-11-10
-2022-11-10 zmzCEZlbV5 zmzCEZlbV5 0v2IfWCEIr mdRkZG9LVW
yNR9pzfPna Q7XmH62qSh iYMJPOhApN QuKGOQYa7l XHYEA9oxnq
bU8pbr0KXA vY2O2CSUY6 8NH1vjDoPB SiSpTkuXNc QZOkZ5IjqD
heoOSWTkNX gOU9E6AR3E 2022-11-10
-2022-11-10 zfOtU6uM5Z zfOtU6uM5Z ALpuvTDVnW mjJPYTgWRl
9wPoJuEY4O Fjl0u6YIup i6MJdwoXrc jdEbHX2ciY at0qPGFS9K
BbFvD5pDHn R8j7s2hZHn YYatCMK0Hp R1wiwcfZ7J sgK2ElpSWh
dMjk2u1h2r MkoSLDtORA 2022-11-10
-2022-11-10 zaCKFeMKPl zaCKFeMKPl 2ZTD9DtO1l MHL1vr5tx4
fiE4PbRVGT B0L7bSYqqE HgJcRjMTEb M1Y8ublbIf duEnPcBFIj
N2j62LjxW4 4kaqVUWoPc Fe09FCOcfV chMDNkDdsu rCMCu231Bb
T6QDStOoKf izRqyR2c6v 2022-11-10
-2022-11-10 zYNiE7iX1z zYNiE7iX1z XWoDz1bYcL Bn8QGcPeVi
DJyDWOYpM3 Kv7jHcWKju eSDLJiXt8i 8uiVxsiVBq CtwoNyHZL8
XJeZsXvRzK VeJZUeQuPW UTeKq4u86J G9BRL00Caw qgXkXNw3LN
RFJIwqft7H 73uqYcUHNU 2022-11-10
-2022-11-10 zRZyJdYT6X zRZyJdYT6X r7KeoDNRia erhjhmnbee
8smgVFxgRY 4zsHrL9mmX GdCn844KLZ 6CT2bojzlB P2X7SBkzcy
uBpZ7VtFNj csGSglKMMF hmDxo1NUOg hUwaq7MFvD m8mu7xQZbS
aKhGVtz40x 7OP7GtYURR 2022-11-10
-
--- !q44 --
-2022-11-10 zyLjAtVdXV
-2022-11-10 zvbIuF1cg8
-2022-11-10 zrjCNYBzpb
-2022-11-10 zpV3iiPrMp
-2022-11-10 zjp4CiDZ8F
-2022-11-10 zceLX7IpL5
-2022-11-10 zVhHON3m5L
-2022-11-10 zTOGIjaaZJ
-2022-11-10 zOeOJwAvfc
-2022-11-10 zNDyH7VSpm
-
--- !q45 --
-2022-11-10 zyLjAtVdXV
-2022-11-10 zvbIuF1cg8
-2022-11-10 zrjCNYBzpb
-2022-11-10 zpV3iiPrMp
-2022-11-10 zjp4CiDZ8F
-2022-11-10 zceLX7IpL5
-2022-11-10 zVhHON3m5L
-2022-11-10 zTOGIjaaZJ
-2022-11-10 zOeOJwAvfc
-2022-11-10 zNDyH7VSpm
-
--- !q46 --
-zyLjAtVdXV GrJRf8WvRR
-zvbIuF1cg8 33ZkOc8Fl7
-zrjCNYBzpb FD1Zxm39qk
-zpV3iiPrMp j0XRD1oFXY
-zjp4CiDZ8F ljiRxP16r2
-zceLX7IpL5 JZtsmIjKGQ
-zVhHON3m5L ecmOZhvo5C
-zTOGIjaaZJ kKS2qRmfG7
-zOeOJwAvfc hQsA8GlyPI
-zNDyH7VSpm x6S8xvWIKO
-
--- !q47 --
-1000
-
--- !q48 --
-
--- !q49 --
-zyLjAtVdXV GrJRf8WvRR
-zvbIuF1cg8 33ZkOc8Fl7
-zrjCNYBzpb FD1Zxm39qk
-zpV3iiPrMp j0XRD1oFXY
-zjp4CiDZ8F ljiRxP16r2
-zceLX7IpL5 JZtsmIjKGQ
-zVhHON3m5L ecmOZhvo5C
-zTOGIjaaZJ kKS2qRmfG7
-zOeOJwAvfc hQsA8GlyPI
-zNDyH7VSpm x6S8xvWIKO
+-- !sql1 --
+2022-11-10 2022-11-10 zyLjAtVdXV GrJRf8WvRR 2022-11-10
+2022-11-10 2022-11-10 zvbIuF1cg8 33ZkOc8Fl7 2022-11-10
+2022-11-10 2022-11-10 zrjCNYBzpb FD1Zxm39qk 2022-11-10
+2022-11-10 2022-11-10 zpV3iiPrMp j0XRD1oFXY 2022-11-10
+2022-11-10 2022-11-10 zjp4CiDZ8F ljiRxP16r2 2022-11-10
+2022-11-10 2022-11-10 zceLX7IpL5 JZtsmIjKGQ 2022-11-10
+2022-11-10 2022-11-10 zVhHON3m5L ecmOZhvo5C 2022-11-10
+2022-11-10 2022-11-10 zTOGIjaaZJ kKS2qRmfG7 2022-11-10
+2022-11-10 2022-11-10 zOeOJwAvfc hQsA8GlyPI 2022-11-10
+2022-11-10 2022-11-10 zNDyH7VSpm x6S8xvWIKO 2022-11-10
--- !q50 --
+-- !sql2 --
2022-11-10 2022-11-10 zyLjAtVdXV GrJRf8WvRR 2022-11-10
2022-11-10 2022-11-10 zvbIuF1cg8 33ZkOc8Fl7 2022-11-10
2022-11-10 2022-11-10 zrjCNYBzpb FD1Zxm39qk 2022-11-10
@@ -396,9 +200,15 @@ zNDyH7VSpm x6S8xvWIKO
2022-11-10 2022-11-10 zOeOJwAvfc hQsA8GlyPI 2022-11-10
2022-11-10 2022-11-10 zNDyH7VSpm x6S8xvWIKO 2022-11-10
--- !q51 --
-china
-america
-cana
-fre
+-- !sql3 --
+2022-11-10 2022-11-10 zyLjAtVdXV GrJRf8WvRR 2022-11-10
+2022-11-10 2022-11-10 zvbIuF1cg8 33ZkOc8Fl7 2022-11-10
+2022-11-10 2022-11-10 zrjCNYBzpb FD1Zxm39qk 2022-11-10
+2022-11-10 2022-11-10 zpV3iiPrMp j0XRD1oFXY 2022-11-10
+2022-11-10 2022-11-10 zjp4CiDZ8F ljiRxP16r2 2022-11-10
+2022-11-10 2022-11-10 zceLX7IpL5 JZtsmIjKGQ 2022-11-10
+2022-11-10 2022-11-10 zVhHON3m5L ecmOZhvo5C 2022-11-10
+2022-11-10 2022-11-10 zTOGIjaaZJ kKS2qRmfG7 2022-11-10
+2022-11-10 2022-11-10 zOeOJwAvfc hQsA8GlyPI 2022-11-10
+2022-11-10 2022-11-10 zNDyH7VSpm x6S8xvWIKO 2022-11-10
diff --git
a/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
b/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
index 9c780b578d..746e4089c0 100644
--- a/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
+++ b/regression-test/suites/external_table_p0/hive/test_hive_query_cache.groovy
@@ -93,8 +93,7 @@ suite("test_hive_query_cache",
"p0,external,hive,external_docker,external_docker
o_year desc;
"""
- // test sql cache
- sql """set enable_sql_cache=true"""
+ // // test sql cache
sql """admin set frontend config("cache_last_version_interval_second"
= "1");"""
sql """use `tpch1_parquet`"""
qt_tpch_1sf_q09 "${tpch_1sf_q09}"
@@ -102,26 +101,46 @@ suite("test_hive_query_cache",
"p0,external,hive,external_docker,external_docker
test {
sql "${tpch_1sf_q09}"
- time 5000
+ time 10000
}
// test sql cache with empty result
- sql """select * from lineitem where l_suppkey="abc";""" // non exist
l_suppkey;
- test {
+ try {
+ sql """set enable_sql_cache=true;"""
+ sql """set test_query_cache_hit="none";"""
+ sql """select * from lineitem where l_suppkey="abc";""" // non
exist l_suppkey;
sql """select * from lineitem where l_suppkey="abc";"""
- // TODO: can not set it very small because the CI env is unstable.
- // Actually, it should cost within 100ms
- time 1000
+ } catch (java.sql.SQLException t) {
+ print t.getMessage()
+ assertTrue(1 == 2)
}
// test more sql cache
sql """use `default`"""
- q01()
- test {
- sql """select dt, dt, k2, k5, dt from table_with_x01 where dt in
('2022-11-10') or dt in ('2022-11-10') order by k2 desc limit 10;"""
- // TODO: can not set it very small because the CI env is unstable.
- // Actually, it should cost within 100ms
- time 1000
+ sql """set enable_sql_cache=true;"""
+ sql """set test_query_cache_hit="none";"""
+ // 1. first query, because we need to init the schema of
table_with_x01 to update the table's update time
+ // then sleep 2 seconds to wait longer than
Config.cache_last_version_interval_second,
+ // so that when doing the second query, we can fill the cache on BE
+ qt_sql1 """select dt, dt, k2, k5, dt from table_with_x01 where dt in
('2022-11-10') or dt in ('2022-11-10') order by k2 desc limit 10;"""
+ sleep(2000);
+ // 2. second query is for filling the cache on BE
+ qt_sql2 """select dt, dt, k2, k5, dt from table_with_x01 where dt in
('2022-11-10') or dt in ('2022-11-10') order by k2 desc limit 10;"""
+ // 3. third query, to test cache hit.
+ sql """set test_query_cache_hit="sql";"""
+ qt_sql3 """select dt, dt, k2, k5, dt from table_with_x01 where dt in
('2022-11-10') or dt in ('2022-11-10') order by k2 desc limit 10;"""
+
+ // test not hit
+ try {
+ sql """set enable_sql_cache=true;"""
+ sql """set test_query_cache_hit="sql";"""
+ def r = UUID.randomUUID().toString();
+ // using a random sql
+ sql """select dt, "${r}" from table_with_x01 where dt in
('2022-11-10') or dt in ('2022-11-10') order by k2 desc limit 10;"""
+ assertTrue(1 == 2)
+ } catch (Exception t) {
+ print t.getMessage()
+ assertTrue(t.getMessage().contains("but the query cache is not
hit"));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
