Skip to content

Commit fc805e4

Browse files
obdevob-robot
authored andcommitted
[CP] fix st_intersects/st_covers performance
1 parent 40d9bb2 commit fc805e4

2 files changed

Lines changed: 0 additions & 22 deletions

File tree

src/sql/engine/expr/ob_expr_st_covers.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,11 +153,6 @@ int ObExprPrivSTCovers::eval_st_covers_common(const ObExpr &expr, ObEvalCtx &ctx
153153
ObGeoEvalCtx gis_context(*mem_ctx, srs);
154154
bool result = false;
155155
if (OB_FAIL(ret)) {
156-
} else if (OB_FAIL(gis_context.append_geo_arg(geo2)) || OB_FAIL(gis_context.append_geo_arg(geo1))) {
157-
LOG_WARN("build gis context failed", K(ret), K(gis_context.get_geo_count()));
158-
} else if (OB_FAIL(ObGeoFunc<ObGeoFuncType::CoveredBy>::geo_func::eval(gis_context, result))) {
159-
LOG_WARN("eval st coveredBy failed", K(ret));
160-
ObGeoExprUtils::geo_func_error_handle(ret, N_PRIV_ST_COVERS);
161156
} else {
162157
ObGeoEvalCtx gis_context(*mem_ctx);
163158
bool result = false;

src/sql/engine/expr/ob_expr_st_intersects.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -148,23 +148,6 @@ int ObExprSTIntersects::eval_st_intersects(const ObExpr &expr, ObEvalCtx &ctx, O
148148
LOG_WARN("add geo2 to const cache failed", K(ret));
149149
}
150150
}
151-
ObGeoEvalCtx gis_context(*mem_ctx);
152-
bool result = false;
153-
if (OB_FAIL(ret)) {
154-
} else if (OB_FAIL(gis_context.append_geo_arg(geo1)) || OB_FAIL(gis_context.append_geo_arg(geo2))) {
155-
LOG_WARN("build gis context failed", K(ret), K(gis_context.get_geo_count()));
156-
} else if (OB_FAIL(ObGeoFunc<ObGeoFuncType::Intersects>::geo_func::eval(gis_context, result))) {
157-
LOG_WARN("eval st intersection failed", K(ret));
158-
ObGeoExprUtils::geo_func_error_handle(ret, N_ST_INTERSECTS);
159-
} else {
160-
if (geo1->type() == ObGeoType::POINT
161-
&& geo2->type() == ObGeoType::POINT
162-
&& result == true
163-
&& OB_FAIL(ObGeoTypeUtil::eval_point_box_intersects(srs, geo1, geo2, result))) {
164-
LOG_WARN("eval box intersection failed", K(ret));
165-
}
166-
}
167-
168151
if (OB_FAIL(ret)) {
169152
} else if (OB_FAIL(ObGeoExprUtils::get_intersects_res(*geo1, *geo2, gis_arg1, gis_arg2,
170153
const_param_cache, srs,

0 commit comments

Comments
 (0)