Skip to content

[#36] Bw compat fix for 7.x query response format changes #63

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

Merged
merged 1 commit into from
Jul 11, 2019
Merged

[#36] Bw compat fix for 7.x query response format changes #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/server/services/ElasticsearchService.gs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,19 @@ var ElasticsearchService_ = (function() {
function handleDataResponse(tableName, tableConfig, context, json, queryJson) {
var rowsCols = { rows: [], cols: [] }
var numHits = 0
var numHitsOperator = "eq"
try {
if (null != json.response) {
numHits = TableRangeUtils_.getJson(json.response || {}, [ "hits", "total" ]) || 0

var isObject = function(possibleObj) {
return (possibleObj === Object(possibleObj)) && !Array.isArray(possibleObj)
}
if (isObject(numHits)) { // 7.x format { relation: "eq"/"gte", value: oldNumHits }
numHitsOperator = numHits.relation || "eq"
numHits = numHits.value || 0
}

rowsCols = ElasticsearchResponseUtils_.buildRowColsFromDataResponse(
tableName, tableConfig, context, json, queryJson
)
Expand All @@ -183,7 +193,7 @@ var ElasticsearchService_ = (function() {
}
ElasticsearchResponseUtils_.handleRowColResponse(
tableName, tableConfig, context, json, rowsCols.rows, rowsCols.cols, /*supportsSize*/true,
numHits
numHits, numHitsOperator
)
}

Expand Down
24 changes: 19 additions & 5 deletions src/server/utils/ElasticsearchResponseUtils.gs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,12 @@ var ElasticsearchResponseUtils_ = (function() {
// 2] General response logic

/** Generic row/col handler for ES responses - rows can be either [ { }. ... ] or [ []. ...], cols: [ { name: }, ... ] */
function handleRowColResponse(tableName, tableConfig, context, json, rows, fullCols, supportsSize, numHits) {
function handleRowColResponse(
tableName, tableConfig,
context,
json, rows, fullCols,
supportsSize, numHits, numHitsOperator
) {
var ss = SpreadsheetApp.getActive()
var tableRange = TableRangeUtils_.findTableRange(ss, tableName)
var range = null
Expand Down Expand Up @@ -427,18 +432,24 @@ var ElasticsearchResponseUtils_ = (function() {
}

// Handle - more/less data than we can write?
var in7xHitsLimited = ("gte" == numHitsOperator)
if (dataRowOffset < numDataRows) { // still have data left to write
var numDataRowsOrTotalHits = (null != numHits) ? numHits : numDataRows
var numDataRowsOrTotalHits = (null != numHits) ? numHits : numDataRows
if (paginationSetup) { // fake pagination but we can use this to tell users if there is more data or not
var pageInfoCell = range.getCell(context.table_meta.page_info_offset.row, context.table_meta.page_info_offset.col - 1)
if (supportsSize) {
var actualPages = Math.ceil(numDataRowsOrTotalHits/context.table_meta.data_size)
pageInfoCell.setValue("Page (of " + actualPages + "):")
if (in7xHitsLimited) {
pageInfoCell.setValue("Page (of >= " + actualPages + "):")
} else {
pageInfoCell.setValue("Page (of " + actualPages + "):")
}
} else {
pageInfoCell.setValue("Page (of > " + context.table_meta.page + "):")
}
} else {
warnings.push("Table not deep enough for all rows, needs to be [" + numDataRowsOrTotalHits + "], is only [" + dataRowOffset + "]")
var numDataRowsOrTotalHitsStr = (in7xHitsLimited ? ">=" : "") + numDataRowsOrTotalHits
warnings.push("Table not deep enough for all rows, needs to be [" + numDataRowsOrTotalHitsStr + "], is only [" + dataRowOffset + "]")
}
} else {
//(quick check that we didn't land on a special row>)
Expand Down Expand Up @@ -466,12 +477,15 @@ var ElasticsearchResponseUtils_ = (function() {
Math.ceil(numHits/context.table_meta.data_size)
if ((null == numHits) && (startRow < 0)) { //special case, no data at all
page = "< " + page
} else if (in7xHitsLimited) {
page = ">= " + page
}
range.getCell(context.table_meta.page_info_offset.row, context.table_meta.page_info_offset.col - 1)
.setValue("Page (of " + page + "):")
} else if ((null != numHits) && (dataRowOffset < numHits)) {
// We have the exact hits so can tell
warnings.push("Table not deep enough for all rows, needs to be [" + numHits + "], is only [" + dataRowOffset + "]")
var numHitsStr = (in7xHitsLimited ? ">=" : "") + numHits
warnings.push("Table not deep enough for all rows, needs to be [" + numHitsStr + "], is only [" + dataRowOffset + "]")
}
}

Expand Down