From b20cd599a025e45de4346c978be47a69f8d8782a Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Wed, 27 Feb 2019 11:22:29 -0600
Subject: [PATCH] GH-282: Remove JSON formatter's range restriction on numbers

It now produces numbers as large as is required to match the data it
needs to represent.  It's up to the consumer to decide how to
appropriately handle values that may be outside their supported
range/precision.

Fixes GH-282
---
 src/threading/formatters/JSON.cc | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/threading/formatters/JSON.cc b/src/threading/formatters/JSON.cc
index f495a76b62..73e9489dc5 100644
--- a/src/threading/formatters/JSON.cc
+++ b/src/threading/formatters/JSON.cc
@@ -77,17 +77,8 @@ bool JSON::Describe(ODesc* desc, Value* val, const string& name) const
 
 		case TYPE_COUNT:
 		case TYPE_COUNTER:
-			{
-			// JSON doesn't support unsigned 64bit ints.
-			if ( val->val.uint_val >= INT64_MAX )
-				{
-				GetThread()->Error(GetThread()->Fmt("count value too large for JSON: %" PRIu64, val->val.uint_val));
-				desc->AddRaw("null", 4);
-				}
-			else
-				desc->Add(val->val.uint_val);
+			desc->Add(val->val.uint_val);
 			break;
-			}
 
 		case TYPE_PORT:
 			desc->Add(val->val.port_val.port);
@@ -149,16 +140,9 @@ bool JSON::Describe(ODesc* desc, Value* val, const string& name) const
 
 			else if ( timestamps == TS_MILLIS )
 				{
-				// ElasticSearch uses milliseconds for timestamps and json only
-				// supports signed ints (uints can be too large).
+				// ElasticSearch uses milliseconds for timestamps
 				uint64_t ts = (uint64_t) (val->val.double_val * 1000);
-				if ( ts < INT64_MAX )
-					desc->Add(ts);
-				else
-					{
-					GetThread()->Error(GetThread()->Fmt("time value too large for JSON milliseconds: %" PRIu64, ts));
-					desc->AddRaw("null", 4);
-					}
+				desc->Add(ts);
 				}
 
 			break;