comparison tests/JDBC_API_Tester.java @ 700:940e266eeccd

Refactor BufferedMCLReader It used to inherit from BufferedReader but there is no reason for that. Also, it used to have a method readLine() which - returned the line read - stored the linetype In the new setup we have a method advance() which reads a line and stores both it and its type. This makes the code more regular and makes it possible to peek ahead without consuming.
author Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com>
date Thu, 08 Dec 2022 15:59:17 +0100 (2022-12-08)
parents 0ff364f569a1
children 5244af37a8e2
comparison
equal deleted inserted replaced
699:0ff364f569a1 700:940e266eeccd
6170 sb.append("Connected to MonetDB server via MapiSocket\n"); 6170 sb.append("Connected to MonetDB server via MapiSocket\n");
6171 6171
6172 org.monetdb.mcl.io.BufferedMCLReader mclIn = server.getReader(); 6172 org.monetdb.mcl.io.BufferedMCLReader mclIn = server.getReader();
6173 org.monetdb.mcl.io.BufferedMCLWriter mclOut = server.getWriter(); 6173 org.monetdb.mcl.io.BufferedMCLWriter mclOut = server.getWriter();
6174 6174
6175 String error = mclIn.waitForPrompt(); 6175 String error = mclIn.discardRemainder();
6176 if (error != null) 6176 if (error != null)
6177 sb.append("Received start error: ").append(error).append("\n"); 6177 sb.append("Received start error: ").append(error).append("\n");
6178 6178
6179 sb.append("Before sending data to STDIN\n"); 6179 sb.append("Before sending data to STDIN\n");
6180 6180
6188 mclOut.write("" + i + ",val_" + i); 6188 mclOut.write("" + i + ",val_" + i);
6189 mclOut.newLine(); 6189 mclOut.newLine();
6190 } 6190 }
6191 mclOut.writeLine(""); // need this one for synchronisation over flush() 6191 mclOut.writeLine(""); // need this one for synchronisation over flush()
6192 6192
6193 error = mclIn.waitForPrompt(); 6193 error = mclIn.discardRemainder();
6194 if (error != null) 6194 if (error != null)
6195 sb.append("Received error: ").append(error).append("\n"); 6195 sb.append("Received error: ").append(error).append("\n");
6196 6196
6197 mclOut.writeLine(""); // need this one for synchronisation over flush() 6197 mclOut.writeLine(""); // need this one for synchronisation over flush()
6198 6198
6199 error = mclIn.waitForPrompt(); 6199 error = mclIn.discardRemainder();
6200 if (error != null) 6200 if (error != null)
6201 sb.append("Received finish error: ").append(error).append("\n"); 6201 sb.append("Received finish error: ").append(error).append("\n");
6202 6202
6203 sb.append("Completed sending data via STDIN\n"); 6203 sb.append("Completed sending data via STDIN\n");
6204 } catch (Exception e) { 6204 } catch (Exception e) {