chore(*): remove the default global cjson instance setting

Kong · Jan 9, 2024 · 9deee70 · 9deee70
1 parent 1601bc8
commit 9deee70
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/kong/db/strategies/postgres/init.lua b/kong/db/strategies/postgres/init.lua
@@ -1,6 +1,5 @@
 local arrays        = require "pgmoon.arrays"
 local json          = require "pgmoon.json"
-local cjson         = require "cjson"
 local cjson_safe    = require "cjson.safe"
 local utils         = require "kong.tools.utils"
 local new_tab       = require "table.new"
@@ -215,7 +214,7 @@ local function escape_literal(connector, literal, field)
       elseif et == "map" or et == "record" or et == "json" then
         local jsons = {}
         for i, v in ipairs(literal) do
-          jsons[i] = cjson.encode(v)
+          jsons[i] = cjson_safe.encode(v)
         end
         return encode_array(jsons) .. '::JSONB[]'
 
@@ -526,7 +525,7 @@ local function page(self, size, token, foreign_key, foreign_entity_name, options
         insert(offset, row[field_name])
       end
 
-      offset = cjson.encode(offset)
+      offset = cjson_safe.encode(offset)
       offset = encode_base64(offset, true)
 
       return rows, nil, offset

diff --git a/kong/db/strategies/postgres/tags.lua b/kong/db/strategies/postgres/tags.lua
@@ -1,4 +1,3 @@
-local cjson         = require "cjson"
 local cjson_safe    = require "cjson.safe"
 
 
@@ -118,7 +117,7 @@ local function page(self, size, token, options, tag)
         last_ordinality
       }
 
-      offset = cjson.encode(offset)
+      offset = cjson_safe.encode(offset)
       offset = encode_base64(offset, true)
 
       return rows, nil, offset

diff --git a/kong/globalpatches.lua b/kong/globalpatches.lua
@@ -17,10 +17,7 @@ return function(options)
   local meta = require "kong.meta"
 
 
-  local cjson = require("cjson")
   local cjson_safe = require("cjson.safe")
-  cjson.encode_sparse_array(nil, nil, 2^15)
-  cjson.encode_number_precision(constants.CJSON_MAX_PRECISION)
   cjson_safe.encode_sparse_array(nil, nil, 2^15)
   cjson_safe.encode_number_precision(constants.CJSON_MAX_PRECISION)
 
@@ -29,7 +26,7 @@ return function(options)
   -- let pb decode arrays to table cjson.empty_array_mt metatable
   -- so empty arrays are encoded as `[]` instead of `nil` or `{}` by cjson.
   pb.option("decode_default_array")
-  pb.defaults("*array", cjson.empty_array_mt)
+  pb.defaults("*array", cjson_safe.empty_array_mt)
 
   if options.cli then
     -- disable the _G write guard alert log introduced in OpenResty 1.15.8.1