Skip to content

Oracle: add subquery to apply sortBy before rownum paging - #7463 #7464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JamieIdox wants to merge 7 commits into
base: main
Choose a base branch
from
+14 −22
Open

Oracle: add subquery to apply sortBy before rownum paging - #7463 #7464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c64ac2
add oracle subquery to apply sortBy before rownum paging - #7463
JamieIdox Mar 26, 2026
27a55d9
shorten lines for clang-format
JamieIdox Mar 27, 2026
d496148
shorten lines for clang-format
JamieIdox Mar 27, 2026
c9f4dc6
shorten lines for clang-format
JamieIdox Mar 27, 2026
fca3fad
linting
jmckenna Mar 27, 2026
b6ff3a7
set default shell
jmckenna Mar 27, 2026
8c884fb
set default shell
jmckenna Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash

set -e

Expand Down
34 changes: 13 additions & 21 deletions src/maporaclespatial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2215,7 +2215,9 @@ int msOracleSpatialLayerWhichShapes(layerObj *layer, rectObj rect,
if (strcmp(srid, "NULL") == 0)
strcpy(srid, "-1");

query_str = msStringConcatenate(query_str, "SELECT ");
/* main query as subquery so that ROWNUM for paging is outside of ORDER BY */
query_str =
msStringConcatenate(query_str, "SELECT btmp.*, ROWNUM FROM (SELECT ");
numitemsinselect = layer->numitems;
/* allocate enough space for items */
if (layer->numitems >= 0) {
Expand Down Expand Up @@ -2284,32 +2286,12 @@ int msOracleSpatialLayerWhichShapes(layerObj *layer, rectObj rect,
query_str = msStringConcatenate(query_str, ",");
}

/*we always want to add rownum in the selection to allow paging to work*/
query_str = msStringConcatenate(query_str, "rownum, ");

query_str = msStringConcatenate(query_str, geom_column_name);
query_str = msStringConcatenate(query_str, " FROM ");
query_str = msStringConcatenate(query_str, table_name);

query_str = osFilteritem(layer, function, query_str, 1);

if (layerinfo->paging && layer->maxfeatures > 0 && layer->startindex < 0) {
if (function == FUNCTION_NONE && layer->filter.native_string == NULL) {
query_str = msStringConcatenate(query_str, " WHERE ");
} else if (function == FUNCTION_NONE &&
layer->filter.native_string != NULL) {
query_str = msStringConcatenate(query_str, " AND ");
}
// avoiding an allocation on the heap here sounds acceptable
char tmpBuf[256];
snprintf(tmpBuf, sizeof(tmpBuf), " ROWNUM<=%d ", layer->maxfeatures);
query_str = msStringConcatenate(query_str, tmpBuf);

if (function != FUNCTION_NONE) {
query_str = msStringConcatenate(query_str, " AND ");
}
}

if ((((atol(srid) >= 8192) && (atol(srid) <= 8330)) || (atol(srid) == 2) ||
(atol(srid) == 5242888) || (atol(srid) == 2000001)) &&
(version == VERSION_9i)) {
Expand All @@ -2329,6 +2311,16 @@ int msOracleSpatialLayerWhichShapes(layerObj *layer, rectObj rect,
msFree(tmp1_str);
}

query_str = msStringConcatenate(query_str, " ) btmp ");

if (layerinfo->paging && layer->maxfeatures > 0 && layer->startindex < 0) {
query_str = msStringConcatenate(query_str, " WHERE ");
// avoiding an allocation on the heap here sounds acceptable
char tmpBuf[256];
snprintf(tmpBuf, sizeof(tmpBuf), " ROWNUM<=%d ", layer->maxfeatures);
query_str = msStringConcatenate(query_str, tmpBuf);
}

/*assuming startindex starts at 1*/
if (layerinfo->paging && layer->startindex > 0) {
tmp1_str = msStrdup("SELECT * from (SELECT atmp.*, ROWNUM rnum from (");
Expand Down
Loading