Remove DestDebugJson output

Author: samwillis

src/backend/access/common/printtup.c

@@ -487,84 +487,3 @@ debugtup(TupleTableSlot *slot, DestReceiver *self)
 
 	return true;
 }
-
-/* ----------------------------------------------------------------
- *		printtup json
- * ----------------------------------------------------------------
- */
-
-StringInfoData json_result;
-
-#ifdef EMSCRIPTEN
-EM_JS(void, dispatch_result, (char *res), {
-	// Dispatch the result to JS land
-	var query_result = UTF8ToString(res);
-	var event = new Module.Event("result", {
-		detail: { result: query_result },
-	});
-	Module.eventTarget.dispatchEvent(event);
-});
-#endif
-
-void
-debugtup_json_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
-{
-	MemoryContext oldcxt = MemoryContextSwitchTo(TopMemoryContext);
-
-	if (!json_result.data)
-		initStringInfo(&json_result);
-	else
-		resetStringInfo(&json_result);
-
-	appendStringInfoChar(&json_result, '[');
-
-	MemoryContextSwitchTo(oldcxt);
-}
-
-bool
-debugtup_json(TupleTableSlot *slot, DestReceiver *self)
-{
-	TupleDesc	tupdesc = slot->tts_tupleDescriptor;
-	int			i;
-	bool		needsep = false;
-
-	/* without tuples json_result contain only '[', so len is 1 */
-	if (json_result.len > 1)
-		appendStringInfoChar(&json_result, ',');
-
-	appendStringInfoChar(&json_result, '{');
-
-	for (i = 0; i < tupdesc->natts; i++)
-	{
-		Datum		val;
-		bool		isnull;
-		char	   *attname;
-		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
-
-		if (att->attisdropped)
-			continue;
-
-		if (needsep)
-			appendStringInfoString(&json_result, ",");
-		needsep = true;
-
-		attname = NameStr(att->attname);
-		escape_json(&json_result, attname);
-		appendStringInfoChar(&json_result, ':');
-
-		val = slot_getattr(slot, i + 1, &isnull);
-		add_json(val, isnull, &json_result, att->atttypid, false);
-	}
-
-	appendStringInfoChar(&json_result, '}');
-
-	return true;
-}
-
-void
-debugtup_json_shutdown(DestReceiver *self)
-{
-	appendStringInfoChar(&json_result, ']');
-	appendStringInfoChar(&json_result, '\0');
-	dispatch_result(json_result.data);
-}

src/backend/tcop/dest.c

@@ -77,11 +77,6 @@ static const DestReceiver debugtupDR = {
 	DestDebug
 };
 
-static const DestReceiver debugtup_jsonDR = {
-	debugtup_json, debugtup_json_startup, debugtup_json_shutdown, donothingCleanup,
-	DestDebugJson
-};
-
 static const DestReceiver printsimpleDR = {
 	printsimple, printsimple_startup, donothingCleanup, donothingCleanup,
 	DestRemoteSimple
@@ -137,9 +132,6 @@ CreateDestReceiver(CommandDest dest)
 		case DestDebug:
 			return unconstify(DestReceiver *, &debugtupDR);
 
-		case DestDebugJson:
-			return unconstify(DestReceiver *, &debugtup_jsonDR);
-
 		case DestSPI:
 			return unconstify(DestReceiver *, &spi_printtupDR);
 
@@ -208,7 +200,6 @@ EndCommand(const QueryCompletion *qc, CommandDest dest, bool force_undecorated_o
 
 		case DestNone:
 		case DestDebug:
-		case DestDebugJson:
 		case DestSPI:
 		case DestTuplestore:
 		case DestIntoRel:
@@ -254,7 +245,6 @@ NullCommand(CommandDest dest)
 
 		case DestNone:
 		case DestDebug:
-		case DestDebugJson:
 		case DestSPI:
 		case DestTuplestore:
 		case DestIntoRel:
@@ -298,7 +288,6 @@ ReadyForQuery(CommandDest dest)
 
 		case DestNone:
 		case DestDebug:
-		case DestDebugJson:
 		case DestSPI:
 		case DestTuplestore:
 		case DestIntoRel:

src/backend/tcop/postgres.c

@@ -93,11 +93,7 @@
 const char *debug_query_string; /* client-supplied query string */
 
 /* Note: whereToSendOutput is initialized for the bootstrap/standalone case */
-#ifdef EMSCRIPTEN
-CommandDest whereToSendOutput = DestRemote;
-#else
 CommandDest whereToSendOutput = DestDebug;
-#endif
 
 /* flag for logging end of session */
 bool		Log_disconnections = false;
@@ -525,14 +521,14 @@ ReadCommand(StringInfo inBuf)
 {
 	int			result;
 
+	if (whereToSendOutput == DestRemote)
 #ifdef EMSCRIPTEN
-	result = EmscriptenBackend(inBuf);
+		result = EmscriptenBackend(inBuf);
 #else
-	if (whereToSendOutput == DestRemote)
 		result = SocketBackend(inBuf);
+#endif
 	else
 		result = InteractiveBackend(inBuf);
-#endif
 	return result;
 }
 
@@ -3748,6 +3744,10 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx,
 		{
 			argv++;
 			argc--;
+#ifdef EMSCRIPTEN
+			/* We want to send output to the client using the wire protocol */
+			whereToSendOutput = DestRemote;
+#endif
 		}
 	}
 	else

src/include/access/printtup.h

@@ -32,12 +32,4 @@ extern void spi_dest_startup(DestReceiver *self, int operation,
 							 TupleDesc typeinfo);
 extern bool spi_printtup(TupleTableSlot *slot, DestReceiver *self);
 
-/* print tuples */
-
-extern bool debugtup_json(TupleTableSlot *slot, DestReceiver *self);
-
-extern void debugtup_json_startup(DestReceiver *self, int operation, TupleDesc typeinfo);
-
-extern void debugtup_json_shutdown(DestReceiver *self);
-
 #endif							/* PRINTTUP_H */

src/include/tcop/dest.h

@@ -88,7 +88,6 @@ typedef enum
 {
 	DestNone,					/* results are discarded */
 	DestDebug,					/* results go to debugging output */
-	DestDebugJson,				/* results go to debugging output as jsons */
 	DestRemote,					/* results sent to frontend process */
 	DestRemoteExecute,			/* sent to frontend, in Execute command */
 	DestRemoteSimple,			/* sent to frontend, w/no catalog access */