# HG changeset patch # User Joeri van Ruth <joeri.van.ruth@monetdbsolutions.com> # Date 1629702581 -7200 # Node ID bd860e850fe1cb6a4bec59bf5126ee5090fe5e7e # Parent 13b48891ac54477cf90bb3e95df6afb8758c903f rename insertFakeFlushes to insertFakePrompts diff --git a/src/main/java/org/monetdb/jdbc/MonetConnection.java b/src/main/java/org/monetdb/jdbc/MonetConnection.java --- a/src/main/java/org/monetdb/jdbc/MonetConnection.java +++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java @@ -3233,7 +3233,7 @@ public class MonetConnection } MonetUploadHandle handle = new MonetUploadHandle(server); - boolean wasFaking = server.setInsertFakeFlushes(false); + boolean wasFaking = server.setInsertFakePrompts(false); try { uploader.handleUpload(handle, path, textMode, offset); if (!handle.hasBeenUsed()) { @@ -3243,7 +3243,7 @@ public class MonetConnection } handle.close(); } finally { - server.setInsertFakeFlushes(wasFaking); + server.setInsertFakePrompts(wasFaking); } return handle.getError(); } diff --git a/src/main/java/org/monetdb/mcl/net/MapiSocket.java b/src/main/java/org/monetdb/mcl/net/MapiSocket.java --- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java +++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java @@ -720,8 +720,8 @@ public class MapiSocket { /* cannot (yet return handshakeOptions; } - public boolean setInsertFakeFlushes(boolean b) { - return fromMonet.setInsertFakeFlush(b); + public boolean setInsertFakePrompts(boolean b) { + return fromMonet.setInsertFakePrompts(b); } /** @@ -857,7 +857,7 @@ public class MapiSocket { /* cannot (yet private int blockLen = 0; private boolean wasEndBlock = false; private final byte[] block = new byte[BLOCK + 3]; // \n.\n - private boolean insertFakeFlush = true; + private boolean insertFakePrompts = true; /** * Constructs this BlockInputStream, backed by the given @@ -870,9 +870,9 @@ public class MapiSocket { /* cannot (yet super(new BufferedInputStream(in)); } - public boolean setInsertFakeFlush(boolean doFake) { - boolean old = insertFakeFlush; - insertFakeFlush = doFake; + public boolean setInsertFakePrompts(boolean doFake) { + boolean old = insertFakePrompts; + insertFakePrompts = doFake; return old; } @@ -995,7 +995,7 @@ public class MapiSocket { /* cannot (yet // if this is the last block, make it end with a newline and prompt if (wasEndBlock) { // insert 'fake' newline and flush - if (insertFakeFlush) { + if (insertFakePrompts) { if (blockLen > 0 && block[blockLen - 1] != '\n') { // to terminate the block in a Reader block[blockLen++] = '\n'; @@ -1004,9 +1004,10 @@ public class MapiSocket { /* cannot (yet block[blockLen++] = b; } block[blockLen++] = '\n'; + if (debug) { + log("RD ", "inserting prompt", true); + } } - if (debug) - log("RD ", "inserting prompt", true); } return blockLen; @@ -1105,11 +1106,11 @@ public class MapiSocket { /* cannot (yet } int readBlock() throws IOException { - boolean wasFaking = setInsertFakeFlush(false); + boolean wasFaking = setInsertFakePrompts(false); try { return BlockInputStream.this.readBlock(); } finally { - setInsertFakeFlush(wasFaking); + setInsertFakePrompts(wasFaking); } }