From: Bruce Momjian Date: Wed, 4 Jul 2001 15:09:54 +0000 (+0000) Subject: The attached patch removes some old and dead code (and some related X-Git-Tag: REL7_2_BETA1~924 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0e4d43f4593cda055d15641e0edce424b0b84fab;p=postgresql The attached patch removes some old and dead code (and some related misleading comments) from the PG_Stream class. Anders Bengtsson --- diff --git a/src/interfaces/jdbc/org/postgresql/PG_Stream.java b/src/interfaces/jdbc/org/postgresql/PG_Stream.java index 5c8a3c6e0b..fb97d3a24b 100644 --- a/src/interfaces/jdbc/org/postgresql/PG_Stream.java +++ b/src/interfaces/jdbc/org/postgresql/PG_Stream.java @@ -56,12 +56,6 @@ public class PG_Stream */ public void SendChar(int val) throws IOException { - // Original code - //byte b[] = new byte[1]; - //b[0] = (byte)val; - //pg_output.write(b); - - // Optimised version by Sverre H. Huseby Aug 22 1999 Applied Sep 13 1999 pg_output.write((byte)val); } @@ -84,30 +78,6 @@ public class PG_Stream Send(buf); } - /** - * Sends an integer to the back end in reverse order. - * - * This is required when the backend uses the routines in the - * src/backend/libpq/pqcomprim.c module. - * - * As time goes by, this should become obsolete. - * - * @param val the integer to be sent - * @param siz the length of the integer in bytes (size of structure) - * @exception IOException if an I/O error occurs - */ - public void SendIntegerReverse(int val, int siz) throws IOException - { - byte[] buf = bytePoolDim1.allocByte(siz); - int p=0; - while (siz-- > 0) - { - buf[p++] = (byte)(val & 0xff); - val >>= 8; - } - Send(buf); - } - /** * Send an array of bytes to the backend * @@ -155,17 +125,6 @@ public class PG_Stream } } - /** - * Sends a packet, prefixed with the packet's length - * @param buf buffer to send - * @exception SQLException if an I/O Error returns - */ - public void SendPacket(byte[] buf) throws IOException - { - SendInteger(buf.length+4,4); - Send(buf); - } - /** * Receives a single character from the backend * diff --git a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java index 9e9b07f89b..4566f562d2 100644 --- a/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java +++ b/src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java @@ -18,19 +18,6 @@ import org.postgresql.util.*; * *

It is based around the file src/interfaces/libpq/fe-exec.c * - * - *

Implementation notes: - * - *

Network protocol: - * - *

The code within the backend reads integers in reverse. - * - *

There is work in progress to convert all of the protocol to - * network order but it may not be there for v6.3 - * - *

When fastpath switches, simply replace SendIntegerReverse() with - * SendInteger() - * * @see org.postgresql.FastpathFastpathArg * @see org.postgresql.LargeObject */ @@ -80,9 +67,7 @@ public class Fastpath // that confuses the backend. The 0 terminates the command line. stream.SendInteger(70,1); stream.SendInteger(0,1); - - //stream.SendIntegerReverse(fnid,4); - //stream.SendIntegerReverse(args.length,4); + stream.SendInteger(fnid,4); stream.SendInteger(args.length,4);