Fix CBL-3330: Support upto 64 select items (#2971)

* It was '1 << index' where '1' was Signed Int, which made it negative when beyond the Signed Int Max * Fixed by making '1ULL << index', now its unsigned long long, it is safe up to 64 now.
couchbase · Jun 24, 2022 · a8c14fa · a8c14fa
1 parent cc7daa3
commit a8c14fa
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/Objective-C/CBLQueryResult.mm b/Objective-C/CBLQueryResult.mm
@@ -281,7 +281,8 @@ - (NSInteger) indexForColumnName: (NSString*)name {
         return -1;
 
     NSInteger index =  colIndex.integerValue;
-    BOOL hasValue = (_missingColumns & (1 << index)) == 0;
+    // this will limit to fetch 64 dictionary keys, check 'testQuerySelectItemsMax'
+    BOOL hasValue = (_missingColumns & (1ULL << index)) == 0;
     return hasValue ? index : -1;
 }
 

diff --git a/Swift/Tests/QueryTest.swift b/Swift/Tests/QueryTest.swift
@@ -71,6 +71,40 @@ class QueryTest: CBLTestCase {
         }
     }
 
+    func testQuerySelectItemsMax() throws {
+        let doc = MutableDocument(id: "docID").setString("value", forKey: "key")
+        try! self.db.saveDocument(doc)
+
+        /**
+         Add one more query item, e.g., '`32`' before `key`, will fail to return the
+            - `r.string(forKey:)`
+            - `r.value(forKey:)`
+            - `r.toJSON()` // empty
+         */
+        let query =
+"""
+            select
+                `1`,`2`,`3`,`4`,`5`,`6`,`7`,`8`,`9`,`10`,`11`,`12`,
+                `13`,`14`,`15`,`16`,`17`,`18`,`19`,`20`,`21`,`22`,`23`,`24`,
+                `25`,`26`,`27`,`28`,`29`,`30`,`31`,`32`,
+                `1`,`2`,`3`,`4`,`5`,`6`,`7`,`8`,`9`,`10`,`11`,`12`,
+                `13`,`14`,`15`,`16`,`17`,`18`,`19`,`20`,`21`,`22`,`23`,`24`,
+                `25`,`26`,`27`,`28`,`29`,`30`,`31`, `key` from _ limit 1
+"""
+        let q = try self.db.createQuery(query)
+        let rs: ResultSet = try q.execute()
+        guard let r = rs.allResults().first else {
+            XCTFail("No result!")
+            return
+        }
+
+        XCTAssertEqual(r.toJSON(), "{\"key\":\"value\"}")
+        XCTAssertEqual(r.string(forKey: "key"), "value")
+        XCTAssertEqual(r.string(at: 63), "value")
+        XCTAssertEqual(r.value(at: 63) as! String, "value")
+        XCTAssertEqual(r.value(forKey: "key") as! String, "value")
+    }
+
     func testNoWhereQuery() throws {
         try loadJSONResource(name: "names_100")