Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

Follow

JetBrains Research 46

square/okhttp/1085/1034

square

okhttp

https://github.com/square/okhttp/issues/1034

https://github.com/square/okhttp/pull/1085

https://github.com/square/okhttp/pull/1085

closes

SpdyConnection.pushExecutor has zero keep-alive time

https://github.com/square/okhttp/blob/master/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java#L158 Because of the 0ms keep-alive time, the pushExecutor creates (and destroys) a new thread on every callback. This seems unnecessarily expensive, compared to reusing the thread, particularly in settings where push callbacks are invoked frequently. Is there a reason why you'd want the threads created for this executor to be effectively single-use?

9aa1268899524f0f750ab35fa363f2ed3cec29cf

712e56de25c8c212d8c85c6b316faeb8789d731c

https://github.com/square/okhttp/compare/9aa1268899524f0f750ab35fa363f2ed3cec29cf...712e56de25c8c212d8c85c6b316faeb8789d731c

diff --git a/okhttp/src/main/java/com/squareup/okhttp/Connection.java b/okhttp/src/main/java/com/squareup/okhttp/Connection.java index 11bf1f217..0806c7954 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Connection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Connection.java @@ -85,7 +85,7 @@ public final class Connection { "TLS_DHE_RSA_WITH_AES_128_CBC_SHA", // 0x00,0x33 Android 2.3 "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", // 0x00,0x32 Android 2.3 "TLS_DHE_RSA_WITH_AES_256_CBC_SHA", // 0x00,0x39 Android 2.3 - "TLS_RSA_WITH_AES_128_GCM_SHA256", // 0x00,0x9C + "TLS_RSA_WITH_AES_128_GCM_SHA256", // 0x00,0x9C Android L "TLS_RSA_WITH_AES_128_CBC_SHA", // 0x00,0x2F Android 2.3 "TLS_RSA_WITH_AES_256_CBC_SHA", // 0x00,0x35 Android 2.3 "SSL_RSA_WITH_3DES_EDE_CBC_SHA", // 0x00,0x0A Android 2.3 (Deprecated in L) diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index 31719ff07..0b6fa2d5f 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -153,8 +153,7 @@ public final class SpdyConnection implements Closeable { if (protocol == Protocol.HTTP_2) { variant = new Http20Draft14(); // Like newSingleThreadExecutor, except lazy creates the thread. - pushExecutor = new ThreadPoolExecutor(0, 1, - 0L, TimeUnit.MILLISECONDS, + pushExecutor = new ThreadPoolExecutor(0, 1, 60, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), Util.threadFactory(String.format("OkHttp %s Push Observer", hostName), true)); // 1 less than SPDY http://tools.ietf.org/html/draft-ietf-httpbis-http2-14#section-6.9.2

['okhttp/src/main/java/com/squareup/okhttp/Connection.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java']

{'.java': 2}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1106/938

square

okhttp

https://github.com/square/okhttp/issues/938

https://github.com/square/okhttp/pull/1106

https://github.com/square/okhttp/pull/1106

closes

SpdyConnection synchronization problem in goAway

We call SpdyStream.receiveRstStream (synchronizes on the stream) while holding the lock on SpdyConnection.this. We should release the SpdyConnection lock before acquiring the SpdyStream lock.

125df557fbeb9c77eb17872acac2eb156428d2ed

8f1bc30cd1e821b8b3745502a0f442f54cdebce8

https://github.com/square/okhttp/compare/125df557fbeb9c77eb17872acac2eb156428d2ed...8f1bc30cd1e821b8b3745502a0f442f54cdebce8

diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index 0b6fa2d5f..d3ebee2e3 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -24,7 +24,6 @@ import java.io.InterruptedIOException; import java.net.InetSocketAddress; import java.net.Socket; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -734,18 +733,19 @@ public final class SpdyConnection implements Closeable { @Override public void goAway(int lastGoodStreamId, ErrorCode errorCode, ByteString debugData) { if (debugData.size() > 0) { // TODO: log the debugData } + + // Copy the streams first. We don't want to hold a lock when we call receiveRstStream(). + SpdyStream[] streamsCopy; synchronized (SpdyConnection.this) { + streamsCopy = streams.values().toArray(new SpdyStream[streams.size()]); shutdown = true; + } - // Fail all streams created after the last good stream ID. - for (Iterator<Map.Entry<Integer, SpdyStream>> i = streams.entrySet().iterator(); - i.hasNext(); ) { - Map.Entry<Integer, SpdyStream> entry = i.next(); - int streamId = entry.getKey(); - if (streamId > lastGoodStreamId && entry.getValue().isLocallyInitiated()) { - entry.getValue().receiveRstStream(ErrorCode.REFUSED_STREAM); - i.remove(); - } + // Fail all streams created after the last good stream ID. + for (SpdyStream spdyStream : streamsCopy) { + if (spdyStream.getId() > lastGoodStreamId && spdyStream.isLocallyInitiated()) { + spdyStream.receiveRstStream(ErrorCode.REFUSED_STREAM); + removeStream(spdyStream.getId()); } } }

['okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java']

{'.java': 1}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/518/184

square

okhttp

https://github.com/square/okhttp/issues/184

https://github.com/square/okhttp/pull/518

https://github.com/square/okhttp/pull/518

closes

OkHttp changes the global SSL context, breaks other HTTP clients

We're enabling SPDY for the shared SSL context, and other HTTP clients like HttpURLConnection don't anticipate this, causing them to freak out and crash the app. @skyisle's original report... Here is backtrace. DEBUG I backtrace: DEBUG I #00 pc 00022430 /system/lib/libssl.so (SSL_select_next_proto+25) DEBUG I #01 pc 000222ef /system/lib/libjavacore.so DEBUG I #02 pc 0002905f /system/lib/libssl.so (ssl_parse_serverhello_tlsext+458) DEBUG I #03 pc 00015957 /system/lib/libssl.so (ssl3_get_server_hello+894) DEBUG I #04 pc 00018193 /system/lib/libssl.so (ssl3_connect+618) DEBUG I #05 pc 000235d7 /system/lib/libssl.so (SSL_connect+18) DEBUG I #06 pc 0001126b /system/lib/libssl.so (ssl23_connect+1970) DEBUG I #07 pc 0002350f /system/lib/libssl.so (SSL_do_handshake+66) DEBUG I #08 pc 00024bc5 /system/lib/libjavacore.so DEBUG I #09 pc 0001e490 /system/lib/libdvm.so (dvmPlatformInvoke+112) DEBUG I #10 pc 0004d2b1 /system/lib/libdvm.so (dvmCallJNIMethod(unsigned int const_, JValue_, Method const_, Thread_)+396) DEBUG I #11 pc 000278a0 /system/lib/libdvm.so DEBUG I #12 pc 0002b77c /system/lib/libdvm.so (dvmInterpret(Thread_, Method const_, JValue_)+176) DEBUG I #13 pc 0005fae5 /system/lib/libdvm.so (dvmCallMethodV(Thread_, Method const_, Object_, bool, JValue_, std::__va_list)+272) DEBUG I #14 pc 0005fb0f /system/lib/libdvm.so (dvmCallMethod(Thread_, Method const_, Object_, JValue*, ...)+20) DEBUG I #15 pc 0005466f /system/lib/libdvm.so DEBUG I #16 pc 0000e418 /system/lib/libc.so (__thread_entry+72) DEBUG I #17 pc 0000db0c /system/lib/libc.so (pthread_create+168) DEBUG I #18 pc 00052f34 <unknown>

de6d505c03419a53e0387802a6cc2196572dd99e

5d7fdbaf30a411c56666462bd032d86e8eb4ddf7

https://github.com/square/okhttp/compare/de6d505c03419a53e0387802a6cc2196572dd99e...5d7fdbaf30a411c56666462bd032d86e8eb4ddf7

diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java index 68e1cfadb..b76b5cd45 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java +++ b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java @@ -15,8 +15,8 @@ */ package com.squareup.okhttp; -import com.squareup.okhttp.internal.bytes.ByteString; import com.squareup.okhttp.internal.Util; +import com.squareup.okhttp.internal.bytes.ByteString; import com.squareup.okhttp.internal.http.HttpAuthenticator; import com.squareup.okhttp.internal.http.HttpURLConnectionImpl; import com.squareup.okhttp.internal.http.HttpsURLConnectionImpl; @@ -31,11 +31,12 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; +import java.security.GeneralSecurityException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; /** Configures and creates HTTP connections. */ @@ -202,8 +203,7 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable { /** * Sets the socket factory used to secure HTTPS connections. * - * <p>If unset, the {@link HttpsURLConnection#getDefaultSSLSocketFactory() - * system-wide default} SSL socket factory will be used. + * <p>If unset, a lazily created SSL socket factory will be used. */ public OkHttpClient setSslSocketFactory(SSLSocketFactory sslSocketFactory) { this.sslSocketFactory = sslSocketFactory; @@ -218,7 +218,8 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable { * Sets the verifier used to confirm that response certificates apply to * requested hostnames for HTTPS connections. * - * <p>If unset, the {@link HttpsURLConnection#getDefaultHostnameVerifier() + * <p>If unset, the + * {@link javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier() * system-wide default} hostname verifier will be used. */ public OkHttpClient setHostnameVerifier(HostnameVerifier hostnameVerifier) { @@ -422,7 +423,7 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable { result.responseCache = toOkResponseCacheOrNull(ResponseCache.getDefault()); } if (result.sslSocketFactory == null) { - result.sslSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory(); + result.sslSocketFactory = getDefaultSSLSocketFactory(); } if (result.hostnameVerifier == null) { result.hostnameVerifier = OkHostnameVerifier.INSTANCE; @@ -439,6 +440,30 @@ public final class OkHttpClient implements URLStreamHandlerFactory, Cloneable { return result; } + /** + * Java and Android programs default to using a single global SSL context, + * accessible to HTTP clients as {@link SSLSocketFactory#getDefault()}. If we + * used the shared SSL context, when OkHttp enables NPN for its SPDY-related + * stuff, it would also enable NPN for other usages, which might crash them + * because NPN is enabled when it isn't expected to be. + * <p> + * This code avoids that by defaulting to an OkHttp created SSL context. The + * significant drawback of this approach is that apps that customize the + * global SSL context will lose these customizations. + */ + private synchronized SSLSocketFactory getDefaultSSLSocketFactory() { + if (sslSocketFactory == null) { + try { + SSLContext sslContext = SSLContext.getInstance("TLS"); + sslContext.init(null, null, null); + sslSocketFactory = sslContext.getSocketFactory(); + } catch (GeneralSecurityException e) { + throw new AssertionError(); // The system has no TLS. Just give up. + } + } + return sslSocketFactory; + } + /** Returns a shallow copy of this OkHttpClient. */ @Override public OkHttpClient clone() { try {

['okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java']

{'.java': 1}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/628/627

square

okhttp

https://github.com/square/okhttp/issues/627

https://github.com/square/okhttp/pull/628

https://github.com/square/okhttp/pull/628

fix

SpdyConnection clears the old settings without merging with the new server settings causing the window size always set as -1

When debugging an issue with client requests hanging on SpdyStream.waitUntilWritable(), we found that the window size is set as -1 in SpdyStream.java at line: this.bytesLeftInWriteWindow = connection.peerSettings.getInitialWindowSize(); After tracing down the issue, the problem turned out to be line 662 of https://github.com/square/okhttp/blob/master/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java, where peerSettings is cleared without merging with the new settings. This has caused any later SpdyStream always uses an –1 as the initial window size, and the bug has also caused the new window size settings not get propagated to existing SpdySteam(s).

945619c3f451bba092f772adbd62cd0a6fd7ec3b

12ba9103d825b776d6cf4f74704332f4118ec1be

https://github.com/square/okhttp/compare/945619c3f451bba092f772adbd62cd0a6fd7ec3b...12ba9103d825b776d6cf4f74704332f4118ec1be

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java index 44459b8c9..294684f1b 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java @@ -17,6 +17,7 @@ package com.squareup.okhttp.internal.spdy; import org.junit.Test; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; import static com.squareup.okhttp.internal.spdy.Settings.DOWNLOAD_BANDWIDTH; import static com.squareup.okhttp.internal.spdy.Settings.DOWNLOAD_RETRANS_RATE; import static com.squareup.okhttp.internal.spdy.Settings.MAX_CONCURRENT_STREAMS; @@ -68,9 +69,10 @@ public final class SettingsTest { settings.set(DOWNLOAD_RETRANS_RATE, 0, 97); assertEquals(97, settings.getDownloadRetransRate(-3)); - assertEquals(-1, settings.getInitialWindowSize()); + assertEquals(DEFAULT_INITIAL_WINDOW_SIZE, + settings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); settings.set(Settings.INITIAL_WINDOW_SIZE, 0, 108); - assertEquals(108, settings.getInitialWindowSize()); + assertEquals(108, settings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); assertEquals(-3, settings.getClientCertificateVectorSize(-3)); settings.set(Settings.CLIENT_CERTIFICATE_VECTOR_SIZE, 0, 117); diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java index 64b81ced1..2ef127e99 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java @@ -39,6 +39,7 @@ import static com.squareup.okhttp.internal.spdy.ErrorCode.INVALID_STREAM; import static com.squareup.okhttp.internal.spdy.ErrorCode.PROTOCOL_ERROR; import static com.squareup.okhttp.internal.spdy.ErrorCode.REFUSED_STREAM; import static com.squareup.okhttp.internal.spdy.ErrorCode.STREAM_IN_USE; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; import static com.squareup.okhttp.internal.spdy.Settings.PERSIST_VALUE; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_DATA; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_GOAWAY; @@ -47,7 +48,6 @@ import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_PING; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_RST_STREAM; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_SETTINGS; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_WINDOW_UPDATE; -import static com.squareup.okhttp.internal.spdy.SpdyConnection.INITIAL_WINDOW_SIZE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -301,7 +301,7 @@ public final class SpdyConnectionTest { // This stream was created *after* the connection settings were adjusted. SpdyStream stream = connection.newStream(headerEntries("a", "android"), false, true); - assertEquals(3368, connection.peerSettings.getInitialWindowSize()); + assertEquals(3368, connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); assertEquals(1684, connection.bytesLeftInWriteWindow); // initial wasn't affected. // New Stream is has the most recent initial window size. assertEquals(3368, stream.bytesLeftInWriteWindow); @@ -405,6 +405,35 @@ public final class SpdyConnectionTest { } } + @Test public void clearSettingsBeforeMerge() throws Exception { + // write the mocking script + Settings settings1 = new Settings(); + settings1.set(Settings.UPLOAD_BANDWIDTH, PERSIST_VALUE, 100); + settings1.set(Settings.DOWNLOAD_BANDWIDTH, PERSIST_VALUE, 200); + settings1.set(Settings.DOWNLOAD_RETRANS_RATE, 0, 300); + peer.sendFrame().settings(settings1); + peer.sendFrame().ping(false, 2, 0); + peer.acceptFrame(); + peer.play(); + + // play it back + SpdyConnection connection = connection(peer, SPDY3); + + peer.takeFrame(); // Guarantees that the Settings frame has been processed. + + // fake a settings frame with clear flag set. + Settings settings2 = new Settings(); + settings2.set(Settings.MAX_CONCURRENT_STREAMS, PERSIST_VALUE, 600); + connection.readerRunnable.settings(true, settings2); + + synchronized (connection) { + assertEquals(-1, connection.peerSettings.getUploadBandwidth(-1)); + assertEquals(-1, connection.peerSettings.getDownloadBandwidth(-1)); + assertEquals(-1, connection.peerSettings.getDownloadRetransRate(-1)); + assertEquals(600, connection.peerSettings.getMaxConcurrentStreams(-1)); + } + } + @Test public void bogusDataFrameDoesNotDisruptConnection() throws Exception { // write the mocking script peer.sendFrame().data(true, 41, new OkBuffer().writeUtf8("bogus")); @@ -1042,7 +1071,7 @@ public final class SpdyConnectionTest { throws IOException, InterruptedException { peer.setVariantAndClient(variant, false); - int windowUpdateThreshold = INITIAL_WINDOW_SIZE / 2; + int windowUpdateThreshold = DEFAULT_INITIAL_WINDOW_SIZE / 2; // Write the mocking script. peer.acceptFrame(); // SYN_STREAM @@ -1152,7 +1181,7 @@ public final class SpdyConnectionTest { } @Test public void writeAwaitsWindowUpdate() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM @@ -1166,7 +1195,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream = connection.newStream(headerEntries("b", "banana"), true, true); BufferedSink out = Okio.buffer(stream.getSink()); - out.write(new byte[INITIAL_WINDOW_SIZE]); + out.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out.flush(); // Check that we've filled the window for both the stream and also the connection. @@ -1194,7 +1223,7 @@ public final class SpdyConnectionTest { } @Test public void initialSettingsWithWindowSizeAdjustsConnection() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM @@ -1208,7 +1237,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream = connection.newStream(headerEntries("a", "apple"), true, true); BufferedSink out = Okio.buffer(stream.getSink()); - out.write(new byte[INITIAL_WINDOW_SIZE]); + out.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out.flush(); // write 1 more than the window size @@ -1221,7 +1250,7 @@ public final class SpdyConnectionTest { // Receiving a Settings with a larger window size will unblock the streams. Settings initial = new Settings(); - initial.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, INITIAL_WINDOW_SIZE + 1); + initial.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, DEFAULT_INITIAL_WINDOW_SIZE + 1); connection.readerRunnable.settings(false, initial); assertEquals(1, connection.bytesLeftInWriteWindow); @@ -1235,7 +1264,7 @@ public final class SpdyConnectionTest { // Settings after the initial do not affect the connection window size. Settings next = new Settings(); - next.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, INITIAL_WINDOW_SIZE + 2); + next.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, DEFAULT_INITIAL_WINDOW_SIZE + 2); connection.readerRunnable.settings(false, next); assertEquals(0, connection.bytesLeftInWriteWindow); // connection wasn't affected. @@ -1263,7 +1292,7 @@ public final class SpdyConnectionTest { } @Test public void blockedStreamDoesntStarveNewStream() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, SPDY3.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, SPDY3.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM on stream 1 @@ -1278,7 +1307,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream1 = connection.newStream(headerEntries("a", "apple"), true, true); BufferedSink out1 = Okio.buffer(stream1.getSink()); - out1.write(new byte[INITIAL_WINDOW_SIZE]); + out1.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out1.flush(); // Check that we've filled the window for both the stream and also the connection. @@ -1299,7 +1328,7 @@ public final class SpdyConnectionTest { assertEquals(0, connection.bytesLeftInWriteWindow); assertEquals(0, connection.getStream(1).bytesLeftInWriteWindow); - assertEquals(INITIAL_WINDOW_SIZE - 3, connection.getStream(3).bytesLeftInWriteWindow); + assertEquals(DEFAULT_INITIAL_WINDOW_SIZE - 3, connection.getStream(3).bytesLeftInWriteWindow); } @Test public void maxFrameSizeHonored() throws Exception { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java index c05d6b174..bf430882e 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java @@ -22,6 +22,12 @@ import java.util.Arrays; * Settings are {@link com.squareup.okhttp.internal.spdy.SpdyConnection connection} scoped. */ final class Settings { + /** + * From the SPDY/3 and HTTP/2 specs, the default initial window size for all + * streams is 64 KiB. (Chrome 25 uses 10 MiB). + */ + static final int DEFAULT_INITIAL_WINDOW_SIZE = 64 * 1024; + /** Peer request to clear durable settings. */ static final int FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x1; @@ -171,11 +177,9 @@ final class Settings { return (bit & set) != 0 ? values[DOWNLOAD_RETRANS_RATE] : defaultValue; } - // TODO: honor this setting in http/2. - /** Returns -1 if unset. */ - int getInitialWindowSize() { + int getInitialWindowSize(int defaultValue) { int bit = 1 << INITIAL_WINDOW_SIZE; - return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : -1; + return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : defaultValue; } /** spdy/3 only. */ diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index fab8698a2..4cd8d32c8 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -38,6 +38,8 @@ import okio.ByteString; import okio.OkBuffer; import okio.Okio; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; + /** * A socket connection to a remote peer. A connection hosts streams which can * send and receive data. @@ -89,8 +91,6 @@ public final class SpdyConnection implements Closeable { private final PushObserver pushObserver; private int nextPingId; - static final int INITIAL_WINDOW_SIZE = 65535; - /** * The total number of bytes consumed by the application, but not yet * acknowledged by sending a {@code WINDOW_UPDATE} frame on this connection. @@ -107,15 +107,12 @@ public final class SpdyConnection implements Closeable { /** Settings we communicate to the peer. */ // TODO: Do we want to dynamically adjust settings, or KISS and only set once? - final Settings okHttpSettings = new Settings() - .set(Settings.INITIAL_WINDOW_SIZE, 0, INITIAL_WINDOW_SIZE); - // TODO: implement stream limit + final Settings okHttpSettings = new Settings(); // okHttpSettings.set(Settings.MAX_CONCURRENT_STREAMS, 0, max); /** Settings we receive from the peer. */ // TODO: MWS will need to guard on this setting before attempting to push. - final Settings peerSettings = new Settings() - .set(Settings.INITIAL_WINDOW_SIZE, 0, INITIAL_WINDOW_SIZE); + final Settings peerSettings = new Settings(); private boolean receivedInitialPeerSettings = false; final FrameReader frameReader; @@ -151,7 +148,7 @@ public final class SpdyConnection implements Closeable { } else { throw new AssertionError(protocol); } - bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(); + bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); frameReader = variant.newReader(builder.source, client); frameWriter = variant.newWriter(builder.sink, client); maxFrameSize = variant.maxFrameSize(); @@ -657,16 +654,13 @@ public final class SpdyConnection implements Closeable { long delta = 0; SpdyStream[] streamsToNotify = null; synchronized (SpdyConnection.this) { - int priorWriteWindowSize = peerSettings.getInitialWindowSize(); - if (clearPrevious) { - peerSettings.clear(); - } else { - peerSettings.merge(newSettings); - } + int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); + if (clearPrevious) peerSettings.clear(); + peerSettings.merge(newSettings); if (getProtocol() == Protocol.HTTP_2) { ackSettingsLater(); } - int peerInitialWindowSize = peerSettings.getInitialWindowSize(); + int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) { delta = peerInitialWindowSize - priorWriteWindowSize; if (!receivedInitialPeerSettings) { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java index 4fea5e8d3..0fcde2dbb 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java @@ -28,6 +28,8 @@ import okio.OkBuffer; import okio.Sink; import okio.Source; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; + /** A logical bidirectional stream. */ public final class SpdyStream { // Internal state is guarded by this. No long-running or potentially @@ -76,8 +78,10 @@ public final class SpdyStream { if (requestHeaders == null) throw new NullPointerException("requestHeaders == null"); this.id = id; this.connection = connection; - this.bytesLeftInWriteWindow = connection.peerSettings.getInitialWindowSize(); - this.source = new SpdyDataSource(connection.okHttpSettings.getInitialWindowSize()); + this.bytesLeftInWriteWindow = + connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); + this.source = new SpdyDataSource( + connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); this.sink = new SpdyDataSink(); this.source.finished = inFinished; this.sink.finished = outFinished; @@ -370,7 +374,8 @@ public final class SpdyStream { // Flow control: notify the peer that we're ready for more data! unacknowledgedBytesRead += read; - if (unacknowledgedBytesRead >= connection.peerSettings.getInitialWindowSize() / 2) { + if (unacknowledgedBytesRead + >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(id, unacknowledgedBytesRead); unacknowledgedBytesRead = 0; } @@ -380,7 +385,7 @@ public final class SpdyStream { synchronized (connection) { // Multiple application threads may hit this section. connection.unacknowledgedBytesRead += read; if (connection.unacknowledgedBytesRead - >= connection.peerSettings.getInitialWindowSize() / 2) { + >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(0, connection.unacknowledgedBytesRead); connection.unacknowledgedBytesRead = 0; }

['okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java']

{'.java': 5}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/631/627

square

okhttp

https://github.com/square/okhttp/issues/627

https://github.com/square/okhttp/pull/631

https://github.com/square/okhttp/pull/631

fix

SpdyConnection clears the old settings without merging with the new server settings causing the window size always set as -1

When debugging an issue with client requests hanging on SpdyStream.waitUntilWritable(), we found that the window size is set as -1 in SpdyStream.java at line: this.bytesLeftInWriteWindow = connection.peerSettings.getInitialWindowSize(); After tracing down the issue, the problem turned out to be line 662 of https://github.com/square/okhttp/blob/master/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java, where peerSettings is cleared without merging with the new settings. This has caused any later SpdyStream always uses an –1 as the initial window size, and the bug has also caused the new window size settings not get propagated to existing SpdySteam(s).

0d774185b616c7d471822f22f57f947412ef593d

83156632582465e93f462f311c0e6b340393c896

https://github.com/square/okhttp/compare/0d774185b616c7d471822f22f57f947412ef593d...83156632582465e93f462f311c0e6b340393c896

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java index 44459b8c9..294684f1b 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java @@ -17,6 +17,7 @@ package com.squareup.okhttp.internal.spdy; import org.junit.Test; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; import static com.squareup.okhttp.internal.spdy.Settings.DOWNLOAD_BANDWIDTH; import static com.squareup.okhttp.internal.spdy.Settings.DOWNLOAD_RETRANS_RATE; import static com.squareup.okhttp.internal.spdy.Settings.MAX_CONCURRENT_STREAMS; @@ -68,9 +69,10 @@ public final class SettingsTest { settings.set(DOWNLOAD_RETRANS_RATE, 0, 97); assertEquals(97, settings.getDownloadRetransRate(-3)); - assertEquals(-1, settings.getInitialWindowSize()); + assertEquals(DEFAULT_INITIAL_WINDOW_SIZE, + settings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); settings.set(Settings.INITIAL_WINDOW_SIZE, 0, 108); - assertEquals(108, settings.getInitialWindowSize()); + assertEquals(108, settings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); assertEquals(-3, settings.getClientCertificateVectorSize(-3)); settings.set(Settings.CLIENT_CERTIFICATE_VECTOR_SIZE, 0, 117); diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java index 8b934fa16..b73d6f930 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java @@ -39,6 +39,7 @@ import static com.squareup.okhttp.internal.spdy.ErrorCode.INVALID_STREAM; import static com.squareup.okhttp.internal.spdy.ErrorCode.PROTOCOL_ERROR; import static com.squareup.okhttp.internal.spdy.ErrorCode.REFUSED_STREAM; import static com.squareup.okhttp.internal.spdy.ErrorCode.STREAM_IN_USE; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; import static com.squareup.okhttp.internal.spdy.Settings.PERSIST_VALUE; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_DATA; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_GOAWAY; @@ -47,7 +48,6 @@ import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_PING; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_RST_STREAM; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_SETTINGS; import static com.squareup.okhttp.internal.spdy.Spdy3.TYPE_WINDOW_UPDATE; -import static com.squareup.okhttp.internal.spdy.SpdyConnection.INITIAL_WINDOW_SIZE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -301,7 +301,7 @@ public final class SpdyConnectionTest { // This stream was created *after* the connection settings were adjusted. SpdyStream stream = connection.newStream(headerEntries("a", "android"), false, true); - assertEquals(3368, connection.peerSettings.getInitialWindowSize()); + assertEquals(3368, connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); assertEquals(1684, connection.bytesLeftInWriteWindow); // initial wasn't affected. // New Stream is has the most recent initial window size. assertEquals(3368, stream.bytesLeftInWriteWindow); @@ -405,6 +405,35 @@ public final class SpdyConnectionTest { } } + @Test public void clearSettingsBeforeMerge() throws Exception { + // write the mocking script + Settings settings1 = new Settings(); + settings1.set(Settings.UPLOAD_BANDWIDTH, PERSIST_VALUE, 100); + settings1.set(Settings.DOWNLOAD_BANDWIDTH, PERSIST_VALUE, 200); + settings1.set(Settings.DOWNLOAD_RETRANS_RATE, 0, 300); + peer.sendFrame().settings(settings1); + peer.sendFrame().ping(false, 2, 0); + peer.acceptFrame(); + peer.play(); + + // play it back + SpdyConnection connection = connection(peer, SPDY3); + + peer.takeFrame(); // Guarantees that the Settings frame has been processed. + + // fake a settings frame with clear flag set. + Settings settings2 = new Settings(); + settings2.set(Settings.MAX_CONCURRENT_STREAMS, PERSIST_VALUE, 600); + connection.readerRunnable.settings(true, settings2); + + synchronized (connection) { + assertEquals(-1, connection.peerSettings.getUploadBandwidth(-1)); + assertEquals(-1, connection.peerSettings.getDownloadBandwidth(-1)); + assertEquals(-1, connection.peerSettings.getDownloadRetransRate(-1)); + assertEquals(600, connection.peerSettings.getMaxConcurrentStreams(-1)); + } + } + @Test public void bogusDataFrameDoesNotDisruptConnection() throws Exception { // write the mocking script peer.sendFrame().data(true, 41, new OkBuffer().writeUtf8("bogus")); @@ -1042,7 +1071,7 @@ public final class SpdyConnectionTest { throws IOException, InterruptedException { peer.setVariantAndClient(variant, false); - int windowUpdateThreshold = INITIAL_WINDOW_SIZE / 2; + int windowUpdateThreshold = DEFAULT_INITIAL_WINDOW_SIZE / 2; // Write the mocking script. peer.acceptFrame(); // SYN_STREAM @@ -1152,7 +1181,7 @@ public final class SpdyConnectionTest { } @Test public void writeAwaitsWindowUpdate() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM @@ -1166,7 +1195,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream = connection.newStream(headerEntries("b", "banana"), true, true); BufferedSink out = Okio.buffer(stream.getSink()); - out.write(new byte[INITIAL_WINDOW_SIZE]); + out.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out.flush(); // Check that we've filled the window for both the stream and also the connection. @@ -1194,7 +1223,7 @@ public final class SpdyConnectionTest { } @Test public void initialSettingsWithWindowSizeAdjustsConnection() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, HTTP_20_DRAFT_09.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM @@ -1208,7 +1237,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream = connection.newStream(headerEntries("a", "apple"), true, true); BufferedSink out = Okio.buffer(stream.getSink()); - out.write(new byte[INITIAL_WINDOW_SIZE]); + out.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out.flush(); // write 1 more than the window size @@ -1221,7 +1250,7 @@ public final class SpdyConnectionTest { // Receiving a Settings with a larger window size will unblock the streams. Settings initial = new Settings(); - initial.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, INITIAL_WINDOW_SIZE + 1); + initial.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, DEFAULT_INITIAL_WINDOW_SIZE + 1); connection.readerRunnable.settings(false, initial); assertEquals(1, connection.bytesLeftInWriteWindow); @@ -1235,7 +1264,7 @@ public final class SpdyConnectionTest { // Settings after the initial do not affect the connection window size. Settings next = new Settings(); - next.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, INITIAL_WINDOW_SIZE + 2); + next.set(Settings.INITIAL_WINDOW_SIZE, PERSIST_VALUE, DEFAULT_INITIAL_WINDOW_SIZE + 2); connection.readerRunnable.settings(false, next); assertEquals(0, connection.bytesLeftInWriteWindow); // connection wasn't affected. @@ -1263,7 +1292,7 @@ public final class SpdyConnectionTest { } @Test public void blockedStreamDoesntStarveNewStream() throws Exception { - int framesThatFillWindow = roundUp(INITIAL_WINDOW_SIZE, SPDY3.maxFrameSize()); + int framesThatFillWindow = roundUp(DEFAULT_INITIAL_WINDOW_SIZE, SPDY3.maxFrameSize()); // Write the mocking script. This accepts more data frames than necessary! peer.acceptFrame(); // SYN_STREAM on stream 1 @@ -1278,7 +1307,7 @@ public final class SpdyConnectionTest { SpdyConnection connection = connection(peer, SPDY3); SpdyStream stream1 = connection.newStream(headerEntries("a", "apple"), true, true); BufferedSink out1 = Okio.buffer(stream1.getSink()); - out1.write(new byte[INITIAL_WINDOW_SIZE]); + out1.write(new byte[DEFAULT_INITIAL_WINDOW_SIZE]); out1.flush(); // Check that we've filled the window for both the stream and also the connection. @@ -1299,7 +1328,7 @@ public final class SpdyConnectionTest { assertEquals(0, connection.bytesLeftInWriteWindow); assertEquals(0, connection.getStream(1).bytesLeftInWriteWindow); - assertEquals(INITIAL_WINDOW_SIZE - 3, connection.getStream(3).bytesLeftInWriteWindow); + assertEquals(DEFAULT_INITIAL_WINDOW_SIZE - 3, connection.getStream(3).bytesLeftInWriteWindow); } @Test public void maxFrameSizeHonored() throws Exception { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java index c05d6b174..bf430882e 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java @@ -22,6 +22,12 @@ import java.util.Arrays; * Settings are {@link com.squareup.okhttp.internal.spdy.SpdyConnection connection} scoped. */ final class Settings { + /** + * From the SPDY/3 and HTTP/2 specs, the default initial window size for all + * streams is 64 KiB. (Chrome 25 uses 10 MiB). + */ + static final int DEFAULT_INITIAL_WINDOW_SIZE = 64 * 1024; + /** Peer request to clear durable settings. */ static final int FLAG_CLEAR_PREVIOUSLY_PERSISTED_SETTINGS = 0x1; @@ -171,11 +177,9 @@ final class Settings { return (bit & set) != 0 ? values[DOWNLOAD_RETRANS_RATE] : defaultValue; } - // TODO: honor this setting in http/2. - /** Returns -1 if unset. */ - int getInitialWindowSize() { + int getInitialWindowSize(int defaultValue) { int bit = 1 << INITIAL_WINDOW_SIZE; - return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : -1; + return (bit & set) != 0 ? values[INITIAL_WINDOW_SIZE] : defaultValue; } /** spdy/3 only. */ diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index 1ab4ab531..5c10db157 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -38,6 +38,8 @@ import java.util.concurrent.SynchronousQueue; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; + /** * A socket connection to a remote peer. A connection hosts streams which can * send and receive data. @@ -89,8 +91,6 @@ public final class SpdyConnection implements Closeable { private final PushObserver pushObserver; private int nextPingId; - static final int INITIAL_WINDOW_SIZE = 65535; - /** * The total number of bytes consumed by the application, but not yet * acknowledged by sending a {@code WINDOW_UPDATE} frame on this connection. @@ -107,15 +107,12 @@ public final class SpdyConnection implements Closeable { /** Settings we communicate to the peer. */ // TODO: Do we want to dynamically adjust settings, or KISS and only set once? - final Settings okHttpSettings = new Settings() - .set(Settings.INITIAL_WINDOW_SIZE, 0, INITIAL_WINDOW_SIZE); - // TODO: implement stream limit + final Settings okHttpSettings = new Settings(); // okHttpSettings.set(Settings.MAX_CONCURRENT_STREAMS, 0, max); /** Settings we receive from the peer. */ // TODO: MWS will need to guard on this setting before attempting to push. - final Settings peerSettings = new Settings() - .set(Settings.INITIAL_WINDOW_SIZE, 0, INITIAL_WINDOW_SIZE); + final Settings peerSettings = new Settings(); private boolean receivedInitialPeerSettings = false; final FrameReader frameReader; @@ -151,7 +148,7 @@ public final class SpdyConnection implements Closeable { } else { throw new AssertionError(protocol); } - bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(); + bytesLeftInWriteWindow = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); frameReader = variant.newReader(builder.source, client); frameWriter = variant.newWriter(builder.sink, client); maxFrameSize = variant.maxFrameSize(); @@ -657,16 +654,13 @@ public final class SpdyConnection implements Closeable { long delta = 0; SpdyStream[] streamsToNotify = null; synchronized (SpdyConnection.this) { - int priorWriteWindowSize = peerSettings.getInitialWindowSize(); - if (clearPrevious) { - peerSettings.clear(); - } else { - peerSettings.merge(newSettings); - } + int priorWriteWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); + if (clearPrevious) peerSettings.clear(); + peerSettings.merge(newSettings); if (getProtocol() == Protocol.HTTP_2) { ackSettingsLater(); } - int peerInitialWindowSize = peerSettings.getInitialWindowSize(); + int peerInitialWindowSize = peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); if (peerInitialWindowSize != -1 && peerInitialWindowSize != priorWriteWindowSize) { delta = peerInitialWindowSize - priorWriteWindowSize; if (!receivedInitialPeerSettings) { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java index d0d2972aa..58d116fec 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java @@ -28,6 +28,8 @@ import java.net.SocketTimeoutException; import java.util.ArrayList; import java.util.List; +import static com.squareup.okhttp.internal.spdy.Settings.DEFAULT_INITIAL_WINDOW_SIZE; + /** A logical bidirectional stream. */ public final class SpdyStream { // Internal state is guarded by this. No long-running or potentially @@ -76,8 +78,10 @@ public final class SpdyStream { if (requestHeaders == null) throw new NullPointerException("requestHeaders == null"); this.id = id; this.connection = connection; - this.bytesLeftInWriteWindow = connection.peerSettings.getInitialWindowSize(); - this.source = new SpdyDataSource(connection.okHttpSettings.getInitialWindowSize()); + this.bytesLeftInWriteWindow = + connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE); + this.source = new SpdyDataSource( + connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE)); this.sink = new SpdyDataSink(); this.source.finished = inFinished; this.sink.finished = outFinished; @@ -370,7 +374,8 @@ public final class SpdyStream { // Flow control: notify the peer that we're ready for more data! unacknowledgedBytesRead += read; - if (unacknowledgedBytesRead >= connection.peerSettings.getInitialWindowSize() / 2) { + if (unacknowledgedBytesRead + >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(id, unacknowledgedBytesRead); unacknowledgedBytesRead = 0; } @@ -380,7 +385,7 @@ public final class SpdyStream { synchronized (connection) { // Multiple application threads may hit this section. connection.unacknowledgedBytesRead += read; if (connection.unacknowledgedBytesRead - >= connection.peerSettings.getInitialWindowSize() / 2) { + >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(0, connection.unacknowledgedBytesRead); connection.unacknowledgedBytesRead = 0; }

['okhttp/src/main/java/com/squareup/okhttp/internal/spdy/Settings.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SettingsTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/SpdyConnectionTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java']

{'.java': 5}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/737/215

square

okhttp

https://github.com/square/okhttp/issues/215

https://github.com/square/okhttp/pull/737

https://github.com/square/okhttp/pull/737

closes

Creating HttpResponseCache causes StrictMode violation

When cache is created I'm having this violation: 06-18 11:19:42.607: E/StrictMode(4300): A resource was acquired at attached stack trace but never released. See java.io.Closeable for information on avoiding resource leaks. 06-18 11:19:42.607: E/StrictMode(4300): java.lang.Throwable: Explicit termination method 'close' not called 06-18 11:19:42.607: E/StrictMode(4300): at dalvik.system.CloseGuard.open(CloseGuard.java:184) 06-18 11:19:42.607: E/StrictMode(4300): at java.io.FileOutputStream.<init>(FileOutputStream.java:90) 06-18 11:19:42.607: E/StrictMode(4300): at com.squareup.okhttp.internal.DiskLruCache.open(DiskLruCache.java:226) 06-18 11:19:42.607: E/StrictMode(4300): at com.squareup.okhttp.HttpResponseCache.<init>(HttpResponseCache.java:171)

6486179b9d9c888a818c85384eed88fa0a8768a6

c51382a430a2adb8a29cb59976af76b2cb48e386

https://github.com/square/okhttp/compare/6486179b9d9c888a818c85384eed88fa0a8768a6...c51382a430a2adb8a29cb59976af76b2cb48e386

diff --git a/okhttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java b/okhttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java index e299d5721..2b701c335 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java +++ b/okhttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java @@ -169,12 +169,18 @@ public final class HttpResponseCache extends ResponseCache implements OkResponse if (snapshot == null) { return null; } - entry = new Entry(snapshot.getInputStream(ENTRY_METADATA)); } catch (IOException e) { // Give up because the cache cannot be read. return null; } + try { + entry = new Entry(snapshot.getInputStream(ENTRY_METADATA)); + } catch (IOException e) { + Util.closeQuietly(snapshot); + return null; + } + Response response = entry.response(request, snapshot); if (!entry.matches(request, response)) {

['okhttp/src/main/java/com/squareup/okhttp/HttpResponseCache.java']

{'.java': 1}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/769/745

square

okhttp

https://github.com/square/okhttp/issues/745

https://github.com/square/okhttp/pull/769

https://github.com/square/okhttp/pull/769

fixes

Can't execute DELETE without body.

I'm trying to create Request just as: ``` Request.Builder builder = new Request.Builder().url("URL"); builder.method("DELETE", null); ``` (because there are no `.delete()` method) When I'm trying to execute such request it crashes, with error message: `java.lang.IllegalStateException: Cannot stream a request body without chunked encoding or a known content length!` As I get it, it happens because DELETE can "has request body" (`hasRequestBody` returns `true` for DELETE) and when we are trying to create request body it blows up, because neither `contentLength` info provided nor `Transfer-Encoding` is set to `chunked` because no body provided. So, there is workaround: just add `Content-Length: 0` header. Looks like it is somekind related to #605.

04aee71eb5007c87d857c4c2690689e89722f092

520d9fc2bc6b251a998b58794070f8bebee9d682

https://github.com/square/okhttp/compare/04aee71eb5007c87d857c4c2690689e89722f092...520d9fc2bc6b251a998b58794070f8bebee9d682

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java index d5851488f..c44f386b8 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java @@ -65,6 +65,148 @@ public final class CallTest { cache.delete(); } + @Test public void get() throws Exception { + server.enqueue(new MockResponse().setBody("abc").addHeader("Content-Type: text/plain")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .header("User-Agent", "SyncApiTest") + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertContainsHeaders("Content-Type: text/plain") + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("GET", recordedRequest.getMethod()); + assertEquals("SyncApiTest", recordedRequest.getHeader("User-Agent")); + assertEquals(0, recordedRequest.getBody().length); + assertNull(recordedRequest.getHeader("Content-Length")); + } + + @Test public void head() throws Exception { + server.enqueue(new MockResponse().addHeader("Content-Type: text/plain")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .head() + .header("User-Agent", "SyncApiTest") + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertContainsHeaders("Content-Type: text/plain"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("HEAD", recordedRequest.getMethod()); + assertEquals("SyncApiTest", recordedRequest.getHeader("User-Agent")); + assertEquals(0, recordedRequest.getBody().length); + assertNull(recordedRequest.getHeader("Content-Length")); + } + + @Test public void post() throws Exception { + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .post(Request.Body.create(MediaType.parse("text/plain"), "def")) + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("POST", recordedRequest.getMethod()); + assertEquals("def", recordedRequest.getUtf8Body()); + assertEquals("3", recordedRequest.getHeader("Content-Length")); + assertEquals("text/plain; charset=utf-8", recordedRequest.getHeader("Content-Type")); + } + + @Test public void postZeroLength() throws Exception { + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .method("POST", null) + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("POST", recordedRequest.getMethod()); + assertEquals(0, recordedRequest.getBody().length); + assertEquals("0", recordedRequest.getHeader("Content-Length")); + assertEquals(null, recordedRequest.getHeader("Content-Type")); + } + + @Test public void delete() throws Exception { + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .delete() + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("DELETE", recordedRequest.getMethod()); + assertEquals(0, recordedRequest.getBody().length); + assertEquals("0", recordedRequest.getHeader("Content-Length")); + assertEquals(null, recordedRequest.getHeader("Content-Type")); + } + + @Test public void put() throws Exception { + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .put(Request.Body.create(MediaType.parse("text/plain"), "def")) + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("PUT", recordedRequest.getMethod()); + assertEquals("def", recordedRequest.getUtf8Body()); + assertEquals("3", recordedRequest.getHeader("Content-Length")); + assertEquals("text/plain; charset=utf-8", recordedRequest.getHeader("Content-Type")); + } + + @Test public void patch() throws Exception { + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + Request request = new Request.Builder() + .url(server.getUrl("/")) + .patch(Request.Body.create(MediaType.parse("text/plain"), "def")) + .build(); + + executeSynchronously(request) + .assertCode(200) + .assertBody("abc"); + + RecordedRequest recordedRequest = server.takeRequest(); + assertEquals("PATCH", recordedRequest.getMethod()); + assertEquals("def", recordedRequest.getUtf8Body()); + assertEquals("3", recordedRequest.getHeader("Content-Length")); + assertEquals("text/plain; charset=utf-8", recordedRequest.getHeader("Content-Type")); + } + @Test public void illegalToExecuteTwice() throws Exception { server.enqueue(new MockResponse() .setBody("abc") @@ -127,25 +269,6 @@ public final class CallTest { assertTrue(server.takeRequest().getHeaders().contains("User-Agent: SyncApiTest")); } - @Test public void get() throws Exception { - server.enqueue(new MockResponse() - .setBody("abc") - .addHeader("Content-Type: text/plain")); - server.play(); - - Request request = new Request.Builder() - .url(server.getUrl("/")) - .header("User-Agent", "SyncApiTest") - .build(); - - executeSynchronously(request) - .assertCode(200) - .assertContainsHeaders("Content-Type: text/plain") - .assertBody("abc"); - - assertTrue(server.takeRequest().getHeaders().contains("User-Agent: SyncApiTest")); - } - @Test public void get_Async() throws Exception { server.enqueue(new MockResponse() .setBody("abc") @@ -340,25 +463,6 @@ public final class CallTest { assertEquals(301, response.code()); } - @Test public void post() throws Exception { - server.enqueue(new MockResponse().setBody("abc")); - server.play(); - - Request request = new Request.Builder() - .url(server.getUrl("/")) - .post(Request.Body.create(MediaType.parse("text/plain"), "def")) - .build(); - - executeSynchronously(request) - .assertCode(200) - .assertBody("abc"); - - RecordedRequest recordedRequest = server.takeRequest(); - assertEquals("def", recordedRequest.getUtf8Body()); - assertEquals("3", recordedRequest.getHeader("Content-Length")); - assertEquals("text/plain; charset=utf-8", recordedRequest.getHeader("Content-Type")); - } - @Test public void post_Async() throws Exception { server.enqueue(new MockResponse().setBody("abc")); server.play(); diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java index fcb26b1fa..1878da5cf 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java @@ -23,6 +23,7 @@ import okio.Buffer; import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public final class RequestTest { @Test public void string() throws Exception { @@ -73,6 +74,36 @@ public final class RequestTest { assertEquals("Retransmit body", "616263", bodyToHex(body)); } + /** Common verbs used for apis such as GitHub, AWS, and Google Cloud. */ + @Test public void crudVerbs() { + MediaType contentType = MediaType.parse("application/json"); + Request.Body body = Request.Body.create(contentType, "{}"); + + Request get = new Request.Builder().url("http://localhost/api").get().build(); + assertEquals("GET", get.method()); + assertNull(get.body()); + + Request head = new Request.Builder().url("http://localhost/api").head().build(); + assertEquals("HEAD", head.method()); + assertNull(head.body()); + + Request delete = new Request.Builder().url("http://localhost/api").delete().build(); + assertEquals("DELETE", delete.method()); + assertNull(delete.body()); + + Request post = new Request.Builder().url("http://localhost/api").post(body).build(); + assertEquals("POST", post.method()); + assertEquals(body, post.body()); + + Request put = new Request.Builder().url("http://localhost/api").put(body).build(); + assertEquals("PUT", put.method()); + assertEquals(body, put.body()); + + Request patch = new Request.Builder().url("http://localhost/api").patch(body).build(); + assertEquals("PATCH", patch.method()); + assertEquals(body, patch.body()); + } + private String bodyToHex(Request.Body body) throws IOException { Buffer buffer = new Buffer(); body.writeTo(buffer); diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java index ac9b48fa8..060b11a95 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java @@ -209,7 +209,7 @@ public class JavaApiConverterTest { @Test public void createOkResponse_fromCacheResponse() throws Exception { final String statusLine = "HTTP/1.1 200 Fantastic"; URI uri = new URI("http://foo/bar"); - Request request = new Request.Builder().url(uri.toURL()).method("GET", null).build(); + Request request = new Request.Builder().url(uri.toURL()).build(); CacheResponse cacheResponse = new CacheResponse() { @Override public Map<String, List<String>> getHeaders() throws IOException { @@ -244,7 +244,7 @@ public class JavaApiConverterTest { final Principal serverPrincipal = SERVER_CERT.getSubjectX500Principal(); final List<Certificate> serverCertificates = Arrays.<Certificate>asList(SERVER_CERT); URI uri = new URI("https://foo/bar"); - Request request = new Request.Builder().url(uri.toURL()).method("GET", null).build(); + Request request = new Request.Builder().url(uri.toURL()).build(); SecureCacheResponse cacheResponse = new SecureCacheResponse() { @Override public Map<String, List<String>> getHeaders() throws IOException { @@ -517,7 +517,7 @@ public class JavaApiConverterTest { @Test public void createJavaUrlConnection_accessibleRequestInfo_GET() throws Exception { Request okRequest = createArbitraryOkRequest().newBuilder() - .method("GET", null) + .get() .build(); Response okResponse = createArbitraryOkResponse(okRequest); HttpURLConnection httpUrlConnection = JavaApiConverter.createJavaUrlConnection(okResponse); @@ -529,7 +529,7 @@ public class JavaApiConverterTest { @Test public void createJavaUrlConnection_accessibleRequestInfo_POST() throws Exception { Request okRequest = createArbitraryOkRequest().newBuilder() - .method("POST", createRequestBody("PostBody")) + .post(createRequestBody("PostBody")) .build(); Response okResponse = createArbitraryOkResponse(okRequest); HttpURLConnection httpUrlConnection = JavaApiConverter.createJavaUrlConnection(okResponse); @@ -541,7 +541,7 @@ public class JavaApiConverterTest { @Test public void createJavaUrlConnection_https_extraHttpsMethods() throws Exception { Request okRequest = createArbitraryOkRequest().newBuilder() - .method("GET", null) + .get() .url("https://secure/request") .build(); Handshake handshake = Handshake.get("SecureCipher", Arrays.<Certificate>asList(SERVER_CERT), @@ -584,7 +584,7 @@ public class JavaApiConverterTest { Request okRequest = createArbitraryOkRequest().newBuilder() .url("http://insecure/request") - .method("GET", null) + .get() .build(); Response okResponse = createArbitraryOkResponse(okRequest).newBuilder() .protocol(Protocol.HTTP_1_1) @@ -607,7 +607,7 @@ public class JavaApiConverterTest { Request okRequest = createArbitraryOkRequest().newBuilder() .url("http://insecure/request") - .method("POST", createRequestBody("RequestBody")) + .post(createRequestBody("RequestBody")) .build(); Response.Body responseBody = createResponseBody("ResponseBody"); Response okResponse = createArbitraryOkResponse(okRequest).newBuilder() @@ -631,7 +631,7 @@ public class JavaApiConverterTest { Request okRequest = createArbitraryOkRequest().newBuilder() .url("https://secure/request") - .method("POST", createRequestBody("RequestBody") ) + .post(createRequestBody("RequestBody") ) .build(); Response.Body responseBody = createResponseBody("ResponseBody"); Handshake handshake = Handshake.get("SecureCipher", Arrays.<Certificate>asList(SERVER_CERT), @@ -754,10 +754,7 @@ public class JavaApiConverterTest { } private static Request createArbitraryOkRequest() { - return new Request.Builder() - .url("http://arbitrary/url") - .method("GET", null) - .build(); + return new Request.Builder().url("http://arbitrary/url").build(); } private static Response createArbitraryOkResponse(Request request) { diff --git a/okhttp/src/main/java/com/squareup/okhttp/Call.java b/okhttp/src/main/java/com/squareup/okhttp/Call.java index 069a04440..3eba08ff1 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Call.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Call.java @@ -16,8 +16,11 @@ package com.squareup.okhttp; import com.squareup.okhttp.internal.NamedRunnable; +import com.squareup.okhttp.internal.Util; import com.squareup.okhttp.internal.http.HttpEngine; +import com.squareup.okhttp.internal.http.HttpMethod; import com.squareup.okhttp.internal.http.OkHeaders; +import com.squareup.okhttp.internal.http.RetryableSink; import java.io.IOException; import java.net.ProtocolException; import okio.BufferedSink; @@ -170,6 +173,7 @@ public final class Call { // Copy body metadata to the appropriate request headers. Request.Body body = request.body(); + RetryableSink requestBodyOut = null; if (body != null) { MediaType contentType = body.contentType(); if (contentType == null) throw new IllegalStateException("contentType == null"); @@ -187,10 +191,12 @@ public final class Call { } request = requestBuilder.build(); + } else if (HttpMethod.hasRequestBody(request.method())) { + requestBodyOut = Util.emptySink(); } // Create the initial HTTP engine. Retries and redirects need new engine for each attempt. - engine = new HttpEngine(client, request, false, null, null, null); + engine = new HttpEngine(client, request, false, null, null, requestBodyOut); while (true) { if (canceled) return null; diff --git a/okhttp/src/main/java/com/squareup/okhttp/Request.java b/okhttp/src/main/java/com/squareup/okhttp/Request.java index 937f3e39b..a6108e18f 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Request.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Request.java @@ -276,10 +276,18 @@ public final class Request { return method("POST", body); } + public Builder delete() { + return method("DELETE", null); + } + public Builder put(Body body) { return method("PUT", body); } + public Builder patch(Body body) { + return method("PATCH", body); + } + public Builder method(String method, Body body) { if (method == null || method.length() == 0) { throw new IllegalArgumentException("method == null || method.length() == 0"); diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/Util.java b/okhttp/src/main/java/com/squareup/okhttp/internal/Util.java index c481ee274..1b86147d1 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/Util.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/Util.java @@ -16,6 +16,7 @@ package com.squareup.okhttp.internal; +import com.squareup.okhttp.internal.http.RetryableSink; import com.squareup.okhttp.internal.spdy.Header; import java.io.Closeable; import java.io.File; @@ -222,4 +223,10 @@ public final class Util { } return result; } + + public static RetryableSink emptySink() { + return EMPTY_SINK; + } + + private static final RetryableSink EMPTY_SINK = new RetryableSink(0); } diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java index 5647f0b73..f5579b3dc 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java @@ -28,6 +28,7 @@ import com.squareup.okhttp.Response; import com.squareup.okhttp.ResponseSource; import com.squareup.okhttp.Route; import com.squareup.okhttp.internal.Dns; +import com.squareup.okhttp.internal.Util; import java.io.IOException; import java.io.InputStream; import java.net.CacheRequest; @@ -283,7 +284,7 @@ public final class HttpEngine { } boolean hasRequestBody() { - return HttpMethod.hasRequestBody(request.method()); + return HttpMethod.hasRequestBody(request.method()) && !Util.emptySink().equals(requestBodyOut); } /** Returns the request body or null if this request doesn't have a body. */ diff --git a/samples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java b/samples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java index 68ac4e043..313e82744 100644 --- a/samples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java +++ b/samples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java @@ -12,10 +12,7 @@ public class PostExample { void run() throws IOException { String json = bowlingJson("Jesse", "Jake"); Request.Body body = Request.Body.create(MediaType.parse("application/json"), json); - Request request = new Request.Builder() - .url("http://www.roundsapp.com/post") - .method("POST", body) - .build(); + Request request = new Request.Builder().url("http://www.roundsapp.com/post").post(body).build(); Response response = client.newCall(request).execute(); System.out.println(response.body().string());

['okhttp-tests/src/test/java/com/squareup/okhttp/internal/huc/JavaApiConverterTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java', 'okhttp/src/main/java/com/squareup/okhttp/Call.java', 'okhttp/src/main/java/com/squareup/okhttp/Request.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/Util.java', 'samples/guide/src/main/java/com/squareup/okhttp/guide/PostExample.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/RequestTest.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java']

{'.java': 8}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/939/933

square

okhttp

https://github.com/square/okhttp/issues/933

https://github.com/square/okhttp/pull/939

https://github.com/square/okhttp/pull/939

closes

Certain SPDY requests always timeout

This simple request to fetch a .mp3 always timeouts. Some requests to the same domain work though. Other clients (Browsers, curl, etc) have no problem. ``` java String url = "https://s.auspiel.de/sounds/effects/mischen-1.mp3"; OkHttpClient httpClient = new OkHttpClient(); httpClient.setReadTimeout(10, TimeUnit.SECONDS); Call call = httpClient.newCall(new Request.Builder(). url(url). tag(url). get().build()); call.enqueue(new com.squareup.okhttp.Callback() { @Override public void onFailure(Request request, Throwable throwable) { System.out.println("Failure"); } @Override public void onResponse(Response response) throws IOException { System.out.println("GOT RESPONSE"); byte[] responseData = response.body().bytes(); System.out.println("READ BODY"); // this is never reached } }); ``` Example repo: https://github.com/MSch/okhttp-spdy-timeout https://github.com/MSch/okhttp-spdy-timeout/blob/master/app/src/main/java/msch/okhttpbug/MyActivity.java#L25-L40 I also tried with OkHttp 2.0.0-RC2 and OkIo master. Same issue. e.g. https://s.auspiel.de/sounds/male/bayerisch/greeting/begruessung-1.mp3 works. Tested devices: Samsung Galaxy Nexus with Android 4.2.2 and Asus Nexus 7 with Android 4.4.2 ``` E/AndroidRuntime﹕ FATAL EXCEPTION: OkHttp Dispatcher java.lang.RuntimeException: java.io.InterruptedIOException: timeout at com.squareup.okhttp.Call$AsyncCall.execute(Call.java:153) at com.squareup.okhttp.internal.NamedRunnable.run(NamedRunnable.java:33) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1080) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:573) at java.lang.Thread.run(Thread.java:856) Caused by: java.io.InterruptedIOException: timeout at com.squareup.okhttp.internal.spdy.SpdyStream$SpdyTimeout.exitAndThrowIfTimedOut(SpdyStream.java:573) at com.squareup.okhttp.internal.spdy.SpdyStream$SpdyDataSource.waitUntilReadable(SpdyStream.java:380) at com.squareup.okhttp.internal.spdy.SpdyStream$SpdyDataSource.read(SpdyStream.java:343) at com.squareup.okhttp.internal.http.SpdyTransport$SpdySource.read(SpdyTransport.java:273) at okio.Buffer.writeAll(Buffer.java:574) at okio.RealBufferedSource.readByteArray(RealBufferedSource.java:87) at com.squareup.okhttp.ResponseBody.bytes(ResponseBody.java:56) at msch.okhttpbug.MyActivity$1.onResponse(MyActivity.java:37) at com.squareup.okhttp.Call$AsyncCall.execute(Call.java:150)             at com.squareup.okhttp.internal.NamedRunnable.run(NamedRunnable.java:33)             at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1080)             at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:573)             at java.lang.Thread.run(Thread.java:856) ```

7213e9b6b9e1508c349ccd6b13b894bd5d8bf96d

6171f554512ce314d5b7008fc660a1697887581c

https://github.com/square/okhttp/compare/7213e9b6b9e1508c349ccd6b13b894bd5d8bf96d...6171f554512ce314d5b7008fc660a1697887581c

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java index 5bcb09e38..e700dd6c6 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java @@ -211,17 +211,17 @@ public final class Http2ConnectionTest { @Test public void readSendsWindowUpdateHttp2() throws Exception { peer.setVariantAndClient(HTTP_2, false); - int windowUpdateThreshold = DEFAULT_INITIAL_WINDOW_SIZE / 2; + int windowSize = 100; + int windowUpdateThreshold = 50; // Write the mocking script. peer.acceptFrame(); // SYN_STREAM peer.sendFrame().synReply(false, 3, headerEntries("a", "android")); for (int i = 0; i < 3; i++) { - // Send frames summing to windowUpdateThreshold. - for (int sent = 0, count; sent < windowUpdateThreshold; sent += count) { - count = Math.min(HTTP_2.maxFrameSize(), windowUpdateThreshold - sent); - peer.sendFrame().data(false, 3, data(count)); - } + // Send frames of summing to size 50, which is windowUpdateThreshold. + peer.sendFrame().data(false, 3, data(24)); + peer.sendFrame().data(false, 3, data(25)); + peer.sendFrame().data(false, 3, data(1)); peer.acceptFrame(); // connection WINDOW UPDATE peer.acceptFrame(); // stream WINDOW UPDATE } @@ -230,15 +230,15 @@ public final class Http2ConnectionTest { // Play it back. SpdyConnection connection = connection(peer, HTTP_2); + connection.okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, windowSize); SpdyStream stream = connection.newStream(headerEntries("b", "banana"), false, true); assertEquals(0, stream.unacknowledgedBytesRead); assertEquals(headerEntries("a", "android"), stream.getResponseHeaders()); Source in = stream.getSource(); Buffer buffer = new Buffer(); - while (in.read(buffer, 1024) != -1) { - if (buffer.size() == 3 * windowUpdateThreshold) break; - } + buffer.writeAll(in); assertEquals(-1, in.read(buffer, 1)); + assertEquals(150, buffer.size()); MockSpdyPeer.InFrame synStream = peer.takeFrame(); assertEquals(TYPE_HEADERS, synStream.type); diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java index 862e2f34a..a6c970362 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java @@ -1013,17 +1013,17 @@ public final class Spdy3ConnectionTest { @Test public void readSendsWindowUpdate() throws Exception { peer.setVariantAndClient(SPDY3, false); - int windowUpdateThreshold = DEFAULT_INITIAL_WINDOW_SIZE / 2; + int windowSize = 100; + int windowUpdateThreshold = 50; // Write the mocking script. peer.acceptFrame(); // SYN_STREAM peer.sendFrame().synReply(false, 1, headerEntries("a", "android")); for (int i = 0; i < 3; i++) { - // Send frames summing to windowUpdateThreshold. - for (int sent = 0, count; sent < windowUpdateThreshold; sent += count) { - count = Math.min(SPDY3.maxFrameSize(), windowUpdateThreshold - sent); - peer.sendFrame().data(false, 1, data(count)); - } + // Send frames of summing to size 50, which is windowUpdateThreshold. + peer.sendFrame().data(false, 1, data(24)); + peer.sendFrame().data(false, 1, data(25)); + peer.sendFrame().data(false, 1, data(1)); peer.acceptFrame(); // connection WINDOW UPDATE peer.acceptFrame(); // stream WINDOW UPDATE } @@ -1032,15 +1032,15 @@ public final class Spdy3ConnectionTest { // Play it back. SpdyConnection connection = connection(peer, SPDY3); + connection.okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, windowSize); SpdyStream stream = connection.newStream(headerEntries("b", "banana"), false, true); assertEquals(0, stream.unacknowledgedBytesRead); assertEquals(headerEntries("a", "android"), stream.getResponseHeaders()); Source in = stream.getSource(); Buffer buffer = new Buffer(); - while (in.read(buffer, 1024) != -1) { - if (buffer.size() == 3 * windowUpdateThreshold) break; - } + buffer.writeAll(in); assertEquals(-1, in.read(buffer, 1)); + assertEquals(150, buffer.size()); MockSpdyPeer.InFrame synStream = peer.takeFrame(); assertEquals(TYPE_HEADERS, synStream.type); diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index bceb25784..8e22f702c 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -113,6 +113,7 @@ public final class SpdyConnection implements Closeable { // TODO: Do we want to dynamically adjust settings, or KISS and only set once? final Settings okHttpSettings = new Settings(); // okHttpSettings.set(Settings.MAX_CONCURRENT_STREAMS, 0, max); + private static final int OKHTTP_CLIENT_WINDOW_SIZE = 16 * 1024 * 1024; /** Settings we receive from the peer. */ // TODO: MWS will need to guard on this setting before attempting to push. @@ -145,7 +146,7 @@ public final class SpdyConnection implements Closeable { // thrashing window updates every 64KiB, yet small enough to avoid blowing // up the heap. if (builder.client) { - okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, 16 * 1024 * 1024); + okHttpSettings.set(Settings.INITIAL_WINDOW_SIZE, 0, OKHTTP_CLIENT_WINDOW_SIZE); } hostName = builder.hostName; @@ -503,6 +504,10 @@ public final class SpdyConnection implements Closeable { public void sendConnectionPreface() throws IOException { frameWriter.connectionPreface(); frameWriter.settings(okHttpSettings); + int windowSize = okHttpSettings.getInitialWindowSize(Settings.DEFAULT_INITIAL_WINDOW_SIZE); + if (windowSize != Settings.DEFAULT_INITIAL_WINDOW_SIZE) { + frameWriter.windowUpdate(0, windowSize - Settings.DEFAULT_INITIAL_WINDOW_SIZE); + } } public static class Builder { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java index 7eb78cbef..331536d37 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java @@ -350,7 +350,7 @@ public final class SpdyStream { // Flow control: notify the peer that we're ready for more data! unacknowledgedBytesRead += read; if (unacknowledgedBytesRead - >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { + >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(id, unacknowledgedBytesRead); unacknowledgedBytesRead = 0; } @@ -360,7 +360,7 @@ public final class SpdyStream { synchronized (connection) { // Multiple application threads may hit this section. connection.unacknowledgedBytesRead += read; if (connection.unacknowledgedBytesRead - >= connection.peerSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { + >= connection.okHttpSettings.getInitialWindowSize(DEFAULT_INITIAL_WINDOW_SIZE) / 2) { connection.writeWindowUpdateLater(0, connection.unacknowledgedBytesRead); connection.unacknowledgedBytesRead = 0; }

['okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Http2ConnectionTest.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/spdy/Spdy3ConnectionTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyStream.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java']

{'.java': 4}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/948/947

square

okhttp

https://github.com/square/okhttp/issues/947

https://github.com/square/okhttp/pull/948

https://github.com/square/okhttp/pull/948

closes

Caching broken by transparent gzip header mismatch

Following the technique described in the Cache javadoc (http://square.github.io/okhttp/javadoc/com/squareup/okhttp/Cache.html) we added the Cache-Control max-stale header to ensure we get a cached response when offline. We're doing this through Retrofit's RequestInterceptor, like so: ``` requestFacade.addHeader("Cache-Control", "max-stale=" + maxStale); ``` This works great in okhttp 1.6: we get a response when offline. However, it no longer works in 2.0RC2 (or master). After some debugging, it turns out there _is_ a cache Response, but it's not returned after this test in Cache.get(Request): ``` if (!entry.matches(request, response)) ``` which in turn is caused by OkHeaders.varyMatches(), which returns false for the Accept-Encoding field: cachedField [], actualField: [gzip]. This issue can be worked around by performing the gzip "by hand" by adding our own gzip header and decompressing the resulting response when necessary (this was not necessary in 1.6), as I described here, after an unrelated transparent gzip issue in an earlier version of okhttp: http://stackoverflow.com/questions/21585347/retrofit-okhttp-retrieve-gzipinputstream/22537697#22537697

eb40f47753ce1a7d45bb3fbcf7eb28ac6e7e2479

94f9a1719cc420be061b16e2da03258552c5060b

https://github.com/square/okhttp/compare/eb40f47753ce1a7d45bb3fbcf7eb28ac6e7e2479...94f9a1719cc420be061b16e2da03258552c5060b

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java index 93163450b..b78a68e92 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java @@ -920,6 +920,19 @@ public final class CacheTest { assertEquals("DEFDEFDEF", readAscii(client.open(server.getUrl("/")))); } + /** https://github.com/square/okhttp/issues/947 */ + @Test public void gzipAndVaryOnAcceptEncoding() throws Exception { + server.enqueue(new MockResponse() + .setBody(gzip("ABCABCABC")) + .addHeader("Content-Encoding: gzip") + .addHeader("Vary: Accept-Encoding") + .addHeader("Cache-Control: max-age=60")); + server.enqueue(new MockResponse().setBody("FAIL")); + + assertEquals("ABCABCABC", readAscii(client.open(server.getUrl("/")))); + assertEquals("ABCABCABC", readAscii(client.open(server.getUrl("/")))); + } + @Test public void conditionalCacheHitIsNotDoublePooled() throws Exception { server.enqueue(new MockResponse().addHeader("ETag: v1").setBody("A")); server.enqueue(new MockResponse() diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java index 6736801fe..b09801b48 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java @@ -174,8 +174,12 @@ public final class OkHeaders { Set<String> varyFields = varyFields(response); if (varyFields.isEmpty()) return new Headers.Builder().build(); + // Use the request headers sent over the network, since that's what the + // response varies on. Otherwise OkHttp-supplied headers like + // "Accept-Encoding: gzip" may be lost. + Headers requestHeaders = response.networkResponse().request().headers(); + Headers.Builder result = new Headers.Builder(); - Headers requestHeaders = response.request().headers(); for (int i = 0; i < requestHeaders.size(); i++) { String fieldName = requestHeaders.name(i); if (varyFields.contains(fieldName)) {

['okhttp/src/main/java/com/squareup/okhttp/internal/http/OkHeaders.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1065/1036

square

okhttp

https://github.com/square/okhttp/issues/1036

https://github.com/square/okhttp/pull/1065

https://github.com/square/okhttp/pull/1065#issuecomment-57098303

fixes

okhttp 2.0.0 OkHttpClient.cancel(tag) doesn't work

The Recipes [Canceling a Call](https://github.com/square/okhttp/wiki/Recipes#canceling-a-call) worked, but after I used `OkHttpClient.cancel(tag)` instead, it didn't work. My code: ``` java import java.io.IOException; import java.util.concurrent.*; import com.squareup.okhttp.*; public class Test { private final ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); private final OkHttpClient client = new OkHttpClient(); public void run() throws Exception { Request request = new Request.Builder() .url("http://httpbin.org/delay/2") // This URL is served with a 2 second delay. .tag("asdf") .build(); final long startNanos = System.nanoTime(); final Call call = client.newCall(request); // Schedule a job to cancel the call in 1 second. executor.schedule(new Runnable() { @Override public void run() { System.out.printf("%.2f Canceling call.%n", (System.nanoTime() - startNanos) / 1e9f); client.cancel("asdf"); System.out.printf("%.2f Canceled call.%n", (System.nanoTime() - startNanos) / 1e9f); } }, 1, TimeUnit.SECONDS); try { System.out.printf("%.2f Executing call.%n", (System.nanoTime() - startNanos) / 1e9f); Response response = call.execute(); System.out.printf("%.2f Call was expected to fail, but completed: %s%n", (System.nanoTime() - startNanos) / 1e9f, response); } catch (IOException e) { System.out.printf("%.2f Call failed as expected: %s%n", (System.nanoTime() - startNanos) / 1e9f, e); } } public static void main(String[] args) throws Exception { new Test().run(); } } ``` Result: ``` 0.25 Executing call. 1.25 Canceling call. 1.25 Canceled call. 3.46 Call was expected to fail, but completed: Response{protocol=http/1.1, code=200, message=OK, url=http://httpbin.org/delay/2} ```

4cdf0a90b3643d198014a56bf619dd9587820fca

38d57953ee7a22a6f87d97ed15e69f17abb2c16f

https://github.com/square/okhttp/compare/4cdf0a90b3643d198014a56bf619dd9587820fca...38d57953ee7a22a6f87d97ed15e69f17abb2c16f

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java index 40519c61d..cefb681be 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java @@ -1172,6 +1172,33 @@ public final class CallTest { assertEquals(1, server.getRequestCount()); } + @Test public void cancelInFlightBeforeResponseReadThrowsIOE() throws Exception { + server.setDispatcher(new Dispatcher() { + @Override public MockResponse dispatch(RecordedRequest request) { + client.cancel("request"); + return new MockResponse().setBody("A"); + } + }); + server.play(); + + Request request = new Request.Builder().url(server.getUrl("/a")).tag("request").build(); + try { + client.newCall(request).execute(); + fail(); + } catch (IOException e) { + } + } + + @Test public void cancelInFlightBeforeResponseReadThrowsIOE_HTTP_2() throws Exception { + enableProtocol(Protocol.HTTP_2); + cancelInFlightBeforeResponseReadThrowsIOE(); + } + + @Test public void cancelInFlightBeforeResponseReadThrowsIOE_SPDY_3() throws Exception { + enableProtocol(Protocol.SPDY_3); + cancelInFlightBeforeResponseReadThrowsIOE(); + } + /** * This test puts a request in front of one that is to be canceled, so that it is canceled before * I/O takes place. diff --git a/okhttp/src/main/java/com/squareup/okhttp/Call.java b/okhttp/src/main/java/com/squareup/okhttp/Call.java index db2cf6107..785a9db38 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Call.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Call.java @@ -77,10 +77,20 @@ public class Call { if (executed) throw new IllegalStateException("Already Executed"); executed = true; } - Response result = getResponse(); - engine.releaseConnection(); // Transfer ownership of the body to the caller. - if (result == null) throw new IOException("Canceled"); - return result; + try { + client.getDispatcher().executed(this); + Response result = getResponse(); + System.out.println("releasing"); + engine.releaseConnection(); // Transfer ownership of the body to the caller. + if (result == null) throw new IOException("Canceled"); + return result; + } finally { + client.getDispatcher().finished(this); + } + } + + Object tag() { + return request.tag(); } /** diff --git a/okhttp/src/main/java/com/squareup/okhttp/Dispatcher.java b/okhttp/src/main/java/com/squareup/okhttp/Dispatcher.java index 0e4644d5b..21f60254a 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Dispatcher.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Dispatcher.java @@ -46,6 +46,9 @@ public final class Dispatcher { /** Running calls. Includes canceled calls that haven't finished yet. */ private final Deque<AsyncCall> runningCalls = new ArrayDeque<>(); + /** In-flight synchronous calls. Includes canceled calls that haven't finished yet. */ + private final Deque<Call> executedCalls = new ArrayDeque<>(); + public Dispatcher(ExecutorService executorService) { this.executorService = executorService; } @@ -123,6 +126,12 @@ public final class Dispatcher { if (engine != null) engine.disconnect(); } } + + for (Call call : executedCalls) { + if (Util.equal(tag, call.tag())) { + call.cancel(); + } + } } /** Used by {@code AsyncCall#run} to signal completion. */ @@ -156,4 +165,14 @@ public final class Dispatcher { } return result; } + + /** Used by {@code Call#execute} to signal it is in-flight. */ + synchronized void executed(Call call) { + executedCalls.add(call); + } + + /** Used by {@code Call#execute} to signal completion. */ + synchronized void finished(Call call) { + if (!executedCalls.remove(call)) throw new AssertionError("Call wasn't in-flight!"); + } } diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java index 916062617..69029dfa4 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java +++ b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java @@ -467,8 +467,8 @@ public class OkHttpClient implements Cloneable { } /** - * Cancels all scheduled tasks tagged with {@code tag}. Requests that are already - * complete cannot be canceled. + * Cancels all scheduled or in-flight calls tagged with {@code tag}. Requests + * that are already complete cannot be canceled. */ public OkHttpClient cancel(Object tag) { getDispatcher().cancel(tag);

['okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java', 'okhttp/src/main/java/com/squareup/okhttp/Dispatcher.java', 'okhttp/src/main/java/com/squareup/okhttp/Call.java']

{'.java': 4}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1259/1043

square

okhttp

https://github.com/square/okhttp/issues/1043

https://github.com/square/okhttp/pull/1259

https://github.com/square/okhttp/pull/1259

closes

Don't recover if a non-GET request fails

Currently it can silently retry requests, but now it's forbidden: http://tools.ietf.org/html/rfc7230 A user agent MUST NOT automatically retry a request with a non- idempotent method unless it has some means to know that the request semantics are actually idempotent, regardless of the method, or some means to detect that the original request was never applied. related to https://github.com/square/okhttp/issues/258

24750b59c4a06e77635cec6ce6999c3db86ff7e4

786e3b3048b84721c73a046b02a9edcbb6927686

https://github.com/square/okhttp/compare/24750b59c4a06e77635cec6ce6999c3db86ff7e4...786e3b3048b84721c73a046b02a9edcbb6927686

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java index 25eb85f95..2255dd8f6 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java @@ -704,6 +704,34 @@ public final class CallTest { callback.await(request.url()).assertHandshake(); } + @Test public void recoverWhenRetryOnConnectionFailureIsTrue() throws Exception { + server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_START)); + server.enqueue(new MockResponse().setBody("retry success")); + + Internal.instance.setNetwork(client, new DoubleInetAddressNetwork()); + assertTrue(client.getRetryOnConnectionFailure()); + + Request request = new Request.Builder().url(server.getUrl("/")).build(); + Response response = client.newCall(request).execute(); + assertEquals("retry success", response.body().string()); + } + + @Test public void noRecoverWhenRetryOnConnectionFailureIsFalse() throws Exception { + server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.DISCONNECT_AT_START)); + server.enqueue(new MockResponse().setBody("unreachable!")); + + Internal.instance.setNetwork(client, new DoubleInetAddressNetwork()); + client.setRetryOnConnectionFailure(false); + + Request request = new Request.Builder().url(server.getUrl("/")).build(); + try { + // If this succeeds, too many requests were made. + client.newCall(request).execute(); + fail(); + } catch (IOException expected) { + } + } + @Test public void recoverFromTlsHandshakeFailure() throws Exception { server.get().useHttps(sslContext.getSocketFactory(), false); server.enqueue(new MockResponse().setSocketPolicy(SocketPolicy.FAIL_HANDSHAKE)); diff --git a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java index 09716a78b..71e646097 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java +++ b/okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java @@ -178,6 +178,7 @@ public class OkHttpClient implements Cloneable { private Network network; private boolean followSslRedirects = true; private boolean followRedirects = true; + private boolean retryOnConnectionFailure = true; private int connectTimeout; private int readTimeout; private int writeTimeout; @@ -208,6 +209,7 @@ public class OkHttpClient implements Cloneable { this.network = okHttpClient.network; this.followSslRedirects = okHttpClient.followSslRedirects; this.followRedirects = okHttpClient.followRedirects; + this.retryOnConnectionFailure = okHttpClient.retryOnConnectionFailure; this.connectTimeout = okHttpClient.connectTimeout; this.readTimeout = okHttpClient.readTimeout; this.writeTimeout = okHttpClient.writeTimeout; @@ -449,6 +451,32 @@ public class OkHttpClient implements Cloneable { return followRedirects; } + /** + * Configure this client to retry or not when a connectivity problem is encountered. By default, + * this client silently recovers from the following problems: + * + * <ul> + * <li><strong>Unreachable IP addresses.</strong> If the URL's host has multiple IP addresses, + * failure to reach any individual IP address doesn't fail the overall request. This can + * increase availability of multi-homed services. + * <li><strong>Stale pooled connections.</strong> The {@link ConnectionPool} reuses sockets + * to decrease request latency, but these connections will occasionally time out. + * <li><strong>Unreachable proxy servers.</strong> A {@link ProxySelector} can be used to + * attempt multiple proxy servers in sequence, eventually falling back to a direct + * connection. + * </ul> + * + * Set this to false to avoid retrying requests when doing so is destructive. In this case the + * calling application should do its own recovery of connectivity failures. + */ + public final void setRetryOnConnectionFailure(boolean retryOnConnectionFailure) { + this.retryOnConnectionFailure = retryOnConnectionFailure; + } + + public final boolean getRetryOnConnectionFailure() { + return retryOnConnectionFailure; + } + final RouteDatabase routeDatabase() { return routeDatabase; } diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java index 461f066c8..d4d9b4cb1 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java @@ -391,6 +391,11 @@ public final class HttpEngine { } private boolean isRecoverable(IOException e) { + // If the application has opted-out of recovery, don't recover. + if (!client.getRetryOnConnectionFailure()) { + return false; + } + // If the problem was a CertificateException from the X509TrustManager, // do not retry, we didn't have an abrupt server-initiated exception. if (e instanceof SSLPeerUnverifiedException

['okhttp/src/main/java/com/squareup/okhttp/OkHttpClient.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/CallTest.java', 'okhttp/src/main/java/com/squareup/okhttp/internal/http/HttpEngine.java']

{'.java': 3}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1254/1158

square

okhttp

https://github.com/square/okhttp/issues/1158

https://github.com/square/okhttp/pull/1254

https://github.com/square/okhttp/pull/1254

closes

Should okhttp be caching HTTP 307 (or 302) responses according to the w3 document?

I am using retrofit and okhttp in my Android app to download documents, images and music files. The files are hosted on Amazon through a CDN so the URLs change often. My backend server will try to use redirects to decrease the need to have to constantly update my content on my mobile app every time the CDN url changes. The devices should also cache responses in the case that the device is offline. For this reason, I am using 301 redirects, which I don't know is the best idea. I was reading the description for 307 redirect at http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html --- 10.3.8 307 Temporary Redirect The requested resource resides temporarily under a different URI. Since the redirection MAY be altered on occasion, the client SHOULD continue to use the Request-URI for future requests. This response is only cacheable if indicated by a Cache-Control or Expires header field. --- At http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html, --- 13.4 - Response Cacheability A response received with a status code of 200, 203, 206, 300, 301 or 410 MAY be stored by a cache and used in reply to a subsequent request, subject to the expiration mechanism, unless a cache-control directive prohibits caching. However, a cache that does not support the Range and Content-Range headers MUST NOT cache 206 (Partial Content) responses. A response received with any other status code (e.g. status codes 302 and 307) MUST NOT be returned in a reply to a subsequent request unless there are cache-control directives or another header(s) that explicitly allow it. For example, these include the following: an Expires header (section 14.21); a "max-age", "s-maxage", "must- revalidate", "proxy-revalidate", "public" or "private" cache-control directive (section 14.9). --- It seems that the description states that caching is possible. I haven't tried this yet, but I did notice that in okhttp's CacheStrategy.java class, it has the following code: --- public static boolean isCacheable(Response response, Request request) { // Always go to network for uncacheable response codes (RFC 2616, 13.4), // This implementation doesn't support caching partial content. int responseCode = response.code(); if (responseCode != HttpURLConnection.HTTP_OK // 200 && responseCode != HttpURLConnection.HTTP_NOT_AUTHORITATIVE // 203 && responseCode != HttpURLConnection.HTTP_MULT_CHOICE // 300 && responseCode != HttpURLConnection.HTTP_MOVED_PERM / 301 && responseCode != HttpURLConnection.HTTP_GONE) { // 410 return false; } --- And to verify that caching isn't enabled for from 302-308, the unit tests from CacheTest.java states the following --- for (int i = 302; i <= 308; ++i) { assertCached(false, i); } --- So the okhttp code explicitly ignores caching for 307, and also 302. I just wanted clarification for this. Is the spec for 307 wrong? Or is something wrong with caching 307 that it was deliberately excluded? If I were to set my own cache headers for 307, it would seem to still be skipped. Just another background information. I know Amazon will support caching with proper cache headers. But since I have to redirect through my own backend, if I don't have caching ability, my offline access to my redirect URL will not respond that I have a cached version from CDN locally. Of course, if I didn't redirect from my backend and go straight to Amazon, then caching wouldn't be a problem through Amazon. Could you provide some advice in this scenario?

64f2af812bef505b6cbc1693aa8b504d9dbbb42e

1d6f0e75d599e2cb02f0fe182f7dbf966cd5cb2b

https://github.com/square/okhttp/compare/64f2af812bef505b6cbc1693aa8b504d9dbbb42e...1d6f0e75d599e2cb02f0fe182f7dbf966cd5cb2b

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java index 9fba4601c..0fd174648 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java @@ -121,9 +121,12 @@ public final class CacheTest { assertCached(false, 207); assertCached(true, 300); assertCached(true, 301); - for (int i = 302; i <= 307; ++i) { - assertCached(false, i); - } + assertCached(true, 302); + assertCached(false, 303); + assertCached(false, 304); + assertCached(false, 305); + assertCached(false, 306); + assertCached(true, 307); assertCached(true, 308); for (int i = 400; i <= 406; ++i) { assertCached(false, i); @@ -394,6 +397,63 @@ public final class CacheTest { assertEquals(2, cache.getHitCount()); } + @Test public void foundCachedWithExpiresHeader() throws Exception { + temporaryRedirectCachedWithCachingHeader(302, "Expires", formatDate(1, TimeUnit.HOURS)); + } + + @Test public void foundCachedWithCacheControlHeader() throws Exception { + temporaryRedirectCachedWithCachingHeader(302, "Cache-Control", "max-age=60"); + } + + @Test public void temporaryRedirectCachedWithExpiresHeader() throws Exception { + temporaryRedirectCachedWithCachingHeader(307, "Expires", formatDate(1, TimeUnit.HOURS)); + } + + @Test public void temporaryRedirectCachedWithCacheControlHeader() throws Exception { + temporaryRedirectCachedWithCachingHeader(307, "Cache-Control", "max-age=60"); + } + + @Test public void foundNotCachedWithoutCacheHeader() throws Exception { + temporaryRedirectNotCachedWithoutCachingHeader(302); + } + + @Test public void temporaryRedirectNotCachedWithoutCacheHeader() throws Exception { + temporaryRedirectNotCachedWithoutCachingHeader(307); + } + + private void temporaryRedirectCachedWithCachingHeader( + int responseCode, String headerName, String headerValue) throws Exception { + server.enqueue(new MockResponse() + .setResponseCode(responseCode) + .addHeader(headerName, headerValue) + .addHeader("Location", "/a")); + server.enqueue(new MockResponse() + .addHeader(headerName, headerValue) + .setBody("a")); + server.enqueue(new MockResponse() + .setBody("b")); + server.enqueue(new MockResponse() + .setBody("c")); + + URL url = server.getUrl("/"); + assertEquals("a", get(url).body().string()); + assertEquals("a", get(url).body().string()); + } + + private void temporaryRedirectNotCachedWithoutCachingHeader(int responseCode) throws Exception { + server.enqueue(new MockResponse() + .setResponseCode(responseCode) + .addHeader("Location", "/a")); + server.enqueue(new MockResponse() + .setBody("a")); + server.enqueue(new MockResponse() + .setBody("b")); + + URL url = server.getUrl("/"); + assertEquals("a", get(url).body().string()); + assertEquals("b", get(url).body().string()); + } + @Test public void serverDisconnectsPrematurelyWithContentLengthHeader() throws IOException { testServerPrematureDisconnect(TransferKind.FIXED_LENGTH); } diff --git a/okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java b/okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java index 800124bdf..79d73f4ee 100644 --- a/okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java +++ b/okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java @@ -132,9 +132,12 @@ public final class UrlConnectionCacheTest { assertCached(false, 207); assertCached(true, 300); assertCached(true, 301); - for (int i = 302; i <= 307; ++i) { - assertCached(false, i); - } + assertCached(true, 302); + assertCached(false, 303); + assertCached(false, 304); + assertCached(false, 305); + assertCached(false, 306); + assertCached(true, 307); assertCached(true, 308); for (int i = 400; i <= 406; ++i) { assertCached(false, i); @@ -158,12 +161,12 @@ public final class UrlConnectionCacheTest { private void assertCached(boolean shouldPut, int responseCode) throws Exception { server = new MockWebServer(); - MockResponse response = - new MockResponse().addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS)) - .addHeader("Expires: " + formatDate(1, TimeUnit.HOURS)) - .setResponseCode(responseCode) - .setBody("ABCDE") - .addHeader("WWW-Authenticate: challenge"); + MockResponse response = new MockResponse() + .addHeader("Last-Modified: " + formatDate(-1, TimeUnit.HOURS)) + .addHeader("Expires: " + formatDate(1, TimeUnit.HOURS)) + .setResponseCode(responseCode) + .setBody("ABCDE") + .addHeader("WWW-Authenticate: challenge"); if (responseCode == HttpURLConnection.HTTP_PROXY_AUTH) { response.addHeader("Proxy-Authenticate: Basic realm=\\"protected area\\""); } else if (responseCode == HttpURLConnection.HTTP_UNAUTHORIZED) { diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java index 93c6d7e6d..69db3947f 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java @@ -7,8 +7,10 @@ import com.squareup.okhttp.Response; import java.util.Date; import static com.squareup.okhttp.internal.http.StatusLine.HTTP_PERM_REDIRECT; +import static com.squareup.okhttp.internal.http.StatusLine.HTTP_TEMP_REDIRECT; import static java.net.HttpURLConnection.HTTP_GONE; import static java.net.HttpURLConnection.HTTP_MOVED_PERM; +import static java.net.HttpURLConnection.HTTP_MOVED_TEMP; import static java.net.HttpURLConnection.HTTP_MULT_CHOICE; import static java.net.HttpURLConnection.HTTP_NOT_AUTHORITATIVE; import static java.net.HttpURLConnection.HTTP_OK; @@ -39,26 +41,36 @@ public final class CacheStrategy { * request. */ public static boolean isCacheable(Response response, Request request) { - // Always go to network for uncacheable response codes (RFC 2616, 13.4), + // Always go to network for uncacheable response codes (RFC 7231 section 6.1), // This implementation doesn't support caching partial content. - int responseCode = response.code(); - if (responseCode != HTTP_OK - && responseCode != HTTP_NOT_AUTHORITATIVE - && responseCode != HTTP_MULT_CHOICE - && responseCode != HTTP_MOVED_PERM - && responseCode != HTTP_GONE - && responseCode != HTTP_PERM_REDIRECT) { - return false; - } + switch (response.code()) { + case HTTP_OK: + case HTTP_NOT_AUTHORITATIVE: + case HTTP_MULT_CHOICE: + case HTTP_MOVED_PERM: + case HTTP_GONE: + case HTTP_PERM_REDIRECT: + // These codes can be cached unless headers forbid it. + break; + + case HTTP_MOVED_TEMP: + case HTTP_TEMP_REDIRECT: + // These codes can only be cached with the right response headers. + if (response.header("Expires") != null + || response.cacheControl().maxAgeSeconds() != -1 + || response.cacheControl().sMaxAgeSeconds() != -1 + || response.cacheControl().isPublic()) { + break; + } + // Fall-through. - // A 'no-store' directive on request or response prevents the response from being cached. - CacheControl responseCaching = response.cacheControl(); - CacheControl requestCaching = request.cacheControl(); - if (responseCaching.noStore() || requestCaching.noStore()) { - return false; + default: + // All other codes cannot be cached. + return false; } - return true; + // A 'no-store' directive on request or response prevents the response from being cached. + return !response.cacheControl().noStore() && !request.cacheControl().noStore(); } public static class Factory {

['okhttp/src/main/java/com/squareup/okhttp/internal/http/CacheStrategy.java', 'okhttp-urlconnection/src/test/java/com/squareup/okhttp/UrlConnectionCacheTest.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/CacheTest.java']

{'.java': 3}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1122/1119

square

okhttp

https://github.com/square/okhttp/issues/1119

https://github.com/square/okhttp/pull/1122

https://github.com/square/okhttp/pull/1122

fixes

ConcurrentModificationException

I wouldn't deem this high priority but it did crash a device. Android 4.4.2 OkHttp 2.0.0 ``` bash java.util.ConcurrentModificationException at java.util.HashMap$HashIterator.nextEntry(HashMap.java:806) at java.util.HashMap$ValueIterator.next(HashMap.java:838) at com.squareup.okhttp.internal.spdy.SpdyConnection$Reader.settings(SourceFile:698) at com.squareup.okhttp.internal.spdy.Spdy3$Reader.readSettings$5f833cfd(SourceFile:278) at com.squareup.okhttp.internal.spdy.Spdy3$Reader.nextFrame$64dcaf67(SourceFile:165) at com.squareup.okhttp.internal.spdy.SpdyConnection$Reader.execute(SourceFile:574) at com.squareup.okhttp.internal.NamedRunnable.run(SourceFile:33) at java.lang.Thread.run(Thread.java:841) ``` [Crashlytics Link](http://crashes.to/s/fef087d43fb)

912d09e7da8830b831ee8f3461e0c66161fc82c8

3820b5c3355a0d5e48691c43481c6201a033a62c

https://github.com/square/okhttp/compare/912d09e7da8830b831ee8f3461e0c66161fc82c8...3820b5c3355a0d5e48691c43481c6201a033a62c

diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java index d3ebee2e3..458fb6db2 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java @@ -695,7 +695,7 @@ public final class SpdyConnection implements Closeable { } } if (streamsToNotify != null && delta != 0) { - for (SpdyStream stream : streams.values()) { + for (SpdyStream stream : streamsToNotify) { synchronized (stream) { stream.addBytesToWriteWindow(delta); }

['okhttp/src/main/java/com/squareup/okhttp/internal/spdy/SpdyConnection.java']

{'.java': 1}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1235/1191

square

okhttp

https://github.com/square/okhttp/issues/1191

https://github.com/square/okhttp/pull/1235

https://github.com/square/okhttp/pull/1235

closes

Crash with Facebook SDK

When I set `URL.setURLStreamHandlerFactory(new OkUrlFactory(client));` accordingly to https://github.com/square/picasso/issues/749, my app crashes because of the Facebook SDK : ``` Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void com.squareup.okhttp.internal.spdy.SpdyStream.close(com.squareup.okhttp.internal.spdy.ErrorCode)' on a null object reference at com.squareup.okhttp.internal.http.SpdyTransport.disconnect(SpdyTransport.java:221) at com.squareup.okhttp.internal.http.HttpEngine.disconnect(HttpEngine.java:465) at com.squareup.okhttp.internal.huc.HttpURLConnectionImpl.disconnect(HttpURLConnectionImpl.java:113) at com.squareup.okhttp.internal.huc.DelegatingHttpsURLConnection.disconnect(DelegatingHttpsURLConnection.java:93) at com.squareup.okhttp.internal.huc.HttpsURLConnectionImpl.disconnect(HttpsURLConnectionImpl.java:25) at com.facebook.internal.Utility.disconnectQuietly(Utility.java:464) at com.facebook.Request.executeConnectionAndWait(Request.java:1563) at com.facebook.Request.executeBatchAndWait(Request.java:1460) at com.facebook.Request.executeBatchAndWait(Request.java:1429) at com.facebook.Request.executeBatchAndWait(Request.java:1411) at com.facebook.Request.executeAndWait(Request.java:1383) at com.facebook.Request.executeAndWait(Request.java:1269) at com.facebook.internal.Utility.getAppSettingsQueryResponse(Utility.java:708) at com.facebook.internal.Utility.access$000(Utility.java:57) at com.facebook.internal.Utility$1.doInBackground(Utility.java:630) at com.facebook.internal.Utility$1.doInBackground(Utility.java:627) at android.os.AsyncTask$2.call(AsyncTask.java:288) at java.util.concurrent.FutureTask.run(FutureTask.java:237)             at android.os.AsyncTask$SerialExecutor$1.run(AsyncTask.java:231)             at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1112)             at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:587)             at java.lang.Thread.run(Thread.java:818) ``` Doesn't happen 100% of the time. Reproduced on Nexus 5 with Android 5.0 (LRX21O)

e536bca6d7b2eb64054ee9845ca43dab19b020a7

0e199f608909793892b7883614c0d20a94c27916

https://github.com/square/okhttp/compare/e536bca6d7b2eb64054ee9845ca43dab19b020a7...0e199f608909793892b7883614c0d20a94c27916

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java index 2c275e028..670361c60 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java @@ -16,6 +16,7 @@ package com.squareup.okhttp.internal.http; import com.squareup.okhttp.Cache; +import com.squareup.okhttp.ConnectionPool; import com.squareup.okhttp.OkHttpClient; import com.squareup.okhttp.OkUrlFactory; import com.squareup.okhttp.Protocol; @@ -426,6 +427,26 @@ public abstract class HttpOverSpdyTest { assertContains(requestB.getHeaders(), "cookie: c=oreo"); } + /** https://github.com/square/okhttp/issues/1191 */ + @Test public void disconnectWithStreamNotEstablished() throws Exception { + ConnectionPool connectionPool = new ConnectionPool(5, 5000); + client.client().setConnectionPool(connectionPool); + + server.enqueue(new MockResponse().setBody("abc")); + server.play(); + + // Disconnect before the stream is created. A connection is still established! + HttpURLConnection connection1 = client.open(server.getUrl("/")); + connection1.connect(); + connection1.disconnect(); + + // That connection is pooled, and it works. + assertEquals(1, connectionPool.getSpdyConnectionCount()); + HttpURLConnection connection2 = client.open(server.getUrl("/")); + assertContent("abc", connection2, 3); + assertEquals(0, server.takeRequest().getSequenceNumber()); + } + <T> void assertContains(Collection<T> collection, T value) { assertTrue(collection.toString(), collection.contains(value)); } diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java index 0561ac38e..61b661081 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java @@ -212,7 +212,7 @@ public final class SpdyTransport implements Transport { } @Override public void disconnect(HttpEngine engine) throws IOException { - stream.close(ErrorCode.CANCEL); + if (stream != null) stream.close(ErrorCode.CANCEL); } @Override public boolean canReuseConnection() {

['okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HttpOverSpdyTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/1249/1239

square

okhttp

https://github.com/square/okhttp/issues/1239

https://github.com/square/okhttp/pull/1249

https://github.com/square/okhttp/pull/1249

closes

ConnectionPool is broken with MAX_CONNECTIONS_TO_CLEANUP

After merging @nfuller's recent leak fix, I noticed we have a new problem. Previously we were pretty eager to trim the idle connections down to the promised limits. An application that quickly created 100 connections would just as quickly see 95 of those connections evicted! With the new fix, it looks like we won't evict more than once every 5 minutes, and we won't evict more than 2 connections per round. That means that we can exceed our promised limits. We can fix this by replacing `Thread.sleep()` with `wait()` and invoke `notify()` where we're currently calling `scheduleCleanupAsRequired`. That'll cause the cleanup thread to take immediate action.

f1a27df8f9a895f6ef7c1e718e09c65726161a26

98c74ace40b089f2769afb3e56c59a64eef327cb

https://github.com/square/okhttp/compare/f1a27df8f9a895f6ef7c1e718e09c65726161a26...98c74ace40b089f2769afb3e56c59a64eef327cb

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java index 075153ddf..0bdc9f58a 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java @@ -443,6 +443,9 @@ public final class ConnectionPoolTest { pool.recycle(httpB); pool.share(spdyA); + // Give the cleanup callable time to run and settle down. + Thread.sleep(100); + // Kill http A. Util.closeQuietly(httpA.getSocket()); @@ -465,6 +468,31 @@ public final class ConnectionPoolTest { assertEquals(0, pool.getConnectionCount()); } + @Test public void maxIdleConnectionsLimitEnforced() throws Exception { + ConnectionPool pool = new ConnectionPool(2, KEEP_ALIVE_DURATION_MS); + + // Hit the max idle connections limit of 2. + pool.recycle(httpA); + pool.recycle(httpB); + Thread.sleep(100); // Give the cleanup callable time to run. + assertPooled(pool, httpB, httpA); + + // Adding httpC bumps httpA. + pool.recycle(httpC); + Thread.sleep(100); // Give the cleanup callable time to run. + assertPooled(pool, httpC, httpB); + + // Adding httpD bumps httpB. + pool.recycle(httpD); + Thread.sleep(100); // Give the cleanup callable time to run. + assertPooled(pool, httpD, httpC); + + // Adding httpE bumps httpC. + pool.recycle(httpE); + Thread.sleep(100); // Give the cleanup callable time to run. + assertPooled(pool, httpE, httpD); + } + @Test public void evictAllConnections() throws Exception { resetWithPoolSize(10); pool.recycle(httpA); diff --git a/okhttp/src/main/java/com/squareup/okhttp/Connection.java b/okhttp/src/main/java/com/squareup/okhttp/Connection.java index 45fc5e933..8d8586ea0 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/Connection.java +++ b/okhttp/src/main/java/com/squareup/okhttp/Connection.java @@ -316,14 +316,6 @@ public final class Connection { return spdyConnection == null || spdyConnection.isIdle(); } - /** - * Returns true if this connection has been idle for longer than - * {@code keepAliveDurationNs}. - */ - boolean isExpired(long keepAliveDurationNs) { - return getIdleStartTimeNs() < System.nanoTime() - keepAliveDurationNs; - } - /** * Returns the time in ns when this connection became idle. Undefined if * this connection is not idle. diff --git a/okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java b/okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java index 0390917ad..16a6adbd1 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java +++ b/okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java @@ -52,7 +52,6 @@ import java.util.concurrent.TimeUnit; * initialized lazily. */ public final class ConnectionPool { - private static final int MAX_CONNECTIONS_TO_CLEANUP = 2; private static final long DEFAULT_KEEP_ALIVE_DURATION_MS = 5 * 60 * 1000; // 5 min private static final ConnectionPool systemDefault; @@ -93,36 +92,9 @@ public final class ConnectionPool { 0 /* corePoolSize */, 1 /* maximumPoolSize */, 60L /* keepAliveTime */, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), Util.threadFactory("OkHttp ConnectionPool", true)); - /** {@code true} if the pool is actively draining, {@code false} if it is currently empty. */ - private boolean draining; - private final Runnable connectionsCleanupRunnable = new Runnable() { - // An executing connectionsCleanupRunnable keeps a reference to the enclosing ConnectionPool, - // preventing the ConnectionPool from being garbage collected before all held connections have - // been explicitly closed. If this was not the case any open connections in the pool would - // trigger StrictMode violations in Android when they were garbage collected. http://b/18369687 @Override public void run() { - while (true) { - performCleanup(); - - // See whether this runnable should continue executing. - synchronized (ConnectionPool.this) { - if (connections.size() == 0) { - draining = false; - return; - } - } - - // Pause to avoid checking the pool too regularly, which would drain the battery on mobile - // devices. - try { - // Use the keep alive duration as a rough indicator of a good check interval. - long keepAliveDurationMillis = keepAliveDurationNs / (1000 * 1000); - Thread.sleep(keepAliveDurationMillis); - } catch (InterruptedException e) { - // Ignored. - } - } + runCleanupUntilPoolIsEmpty(); } }; @@ -188,7 +160,6 @@ public final class ConnectionPool { if (foundConnection != null && foundConnection.isSpdy()) { connections.addFirst(foundConnection); // Add it back after iteration. - scheduleCleanupAsRequired(); } return foundConnection; @@ -224,10 +195,19 @@ public final class ConnectionPool { } synchronized (this) { - connections.addFirst(connection); + addConnection(connection); connection.incrementRecycleCount(); connection.resetIdleStartTime(); - scheduleCleanupAsRequired(); + } + } + + private void addConnection(Connection connection) { + boolean empty = connections.isEmpty(); + connections.addFirst(connection); + if (empty) { + executor.execute(connectionsCleanupRunnable); + } else { + notifyAll(); } } @@ -237,71 +217,104 @@ public final class ConnectionPool { */ void share(Connection connection) { if (!connection.isSpdy()) throw new IllegalArgumentException(); - if (connection.isAlive()) { - synchronized (this) { - connections.addFirst(connection); - scheduleCleanupAsRequired(); - } + if (!connection.isAlive()) return; + synchronized (this) { + addConnection(connection); } } /** Close and remove all connections in the pool. */ public void evictAll() { - List<Connection> connections; + List<Connection> toEvict; synchronized (this) { - connections = new ArrayList<>(this.connections); - this.connections.clear(); + toEvict = new ArrayList<>(connections); + connections.clear(); } - for (int i = 0, size = connections.size(); i < size; i++) { - Util.closeQuietly(connections.get(i).getSocket()); + for (int i = 0, size = toEvict.size(); i < size; i++) { + Util.closeQuietly(toEvict.get(i).getSocket()); } } - // Callers must synchronize on "this". - private void scheduleCleanupAsRequired() { - if (!draining) { - // A new connection has potentially been offered up to an empty / drained pool. - // Start the clean-up immediately. - draining = true; - executor.execute(connectionsCleanupRunnable); + private void runCleanupUntilPoolIsEmpty() { + while (true) { + if (!performCleanup()) return; // Halt cleanup. } } - /** Performs a single round of pool cleanup. */ + /** + * Attempts to make forward progress on connection eviction. There are three possible outcomes: + * + * <h3>The pool is empty.</h3> + * In this case, this method returns false and the eviction job should exit because there are no + * further cleanup tasks coming. (If additional connections are added to the pool, another cleanup + * job must be enqueued.) + * + * <h3>Connections were evicted.</h3> + * At least one connections was eligible for immediate eviction and was evicted. The method + * returns true and cleanup should continue. + * + * <h3>We waited to evict.</h3> + * None of the pooled connections were eligible for immediate eviction. Instead, we waited until + * either a connection became eligible for eviction, or the connections list changed. In either + * case, the method returns true and cleanup should continue. + */ // VisibleForTesting - void performCleanup() { - List<Connection> expiredConnections = new ArrayList<>(MAX_CONNECTIONS_TO_CLEANUP); - int idleConnectionCount = 0; + boolean performCleanup() { + List<Connection> evictableConnections; + synchronized (this) { + if (connections.isEmpty()) return false; // Halt cleanup. + + evictableConnections = new ArrayList<>(); + int idleConnectionCount = 0; + long now = System.nanoTime(); + long nanosUntilNextEviction = keepAliveDurationNs; + + // Collect connections eligible for immediate eviction. for (ListIterator<Connection> i = connections.listIterator(connections.size()); i.hasPrevious(); ) { Connection connection = i.previous(); - if (!connection.isAlive() || connection.isExpired(keepAliveDurationNs)) { + long nanosUntilEviction = connection.getIdleStartTimeNs() + keepAliveDurationNs - now; + if (nanosUntilEviction <= 0 || !connection.isAlive()) { i.remove(); - expiredConnections.add(connection); - if (expiredConnections.size() == MAX_CONNECTIONS_TO_CLEANUP) { - break; - } + evictableConnections.add(connection); } else if (connection.isIdle()) { idleConnectionCount++; + nanosUntilNextEviction = Math.min(nanosUntilNextEviction, nanosUntilEviction); } } + // If the pool has too many idle connections, gather more! Oldest to newest. for (ListIterator<Connection> i = connections.listIterator(connections.size()); i.hasPrevious() && idleConnectionCount > maxIdleConnections; ) { Connection connection = i.previous(); if (connection.isIdle()) { - expiredConnections.add(connection); + evictableConnections.add(connection); i.remove(); --idleConnectionCount; } } + + // If there's nothing to evict, wait. (This will be interrupted if connections are added.) + if (evictableConnections.isEmpty()) { + try { + long millisUntilNextEviction = nanosUntilNextEviction / (1000 * 1000); + long remainderNanos = nanosUntilNextEviction - millisUntilNextEviction * (1000 * 1000); + this.wait(millisUntilNextEviction, (int) remainderNanos); + return true; // Cleanup continues. + } catch (InterruptedException ignored) { + } + } } - for (Connection expiredConnection : expiredConnections) { + // Actually do the eviction. Note that we avoid synchronized() when closing sockets. + for (int i = 0, size = evictableConnections.size(); i < size; i++) { + Connection expiredConnection = evictableConnections.get(i); Util.closeQuietly(expiredConnection.getSocket()); } + + return true; // Cleanup continues. } /**

['okhttp-tests/src/test/java/com/squareup/okhttp/ConnectionPoolTest.java', 'okhttp/src/main/java/com/squareup/okhttp/Connection.java', 'okhttp/src/main/java/com/squareup/okhttp/ConnectionPool.java']

{'.java': 3}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

square/okhttp/980/979

square

okhttp

https://github.com/square/okhttp/issues/979

https://github.com/square/okhttp/pull/980

https://github.com/square/okhttp/pull/980

fixes

SpdyTransport sets the wrong protocol

SpdyTransport sets the response protocol according to the status line. https://github.com/square/okhttp/blob/master/okhttp/src/main/java/com/squareup/okhttp/internal/http/StatusLine.java#L41 It seems to me that it should be clarified with the transport protocol, here, right? https://github.com/square/okhttp/blob/master/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java#L206

0766369844b26f64fc2e8d551ee8b5b00aa3fd87

9a35caf73356aa9a0142f5c5a0c50fde60d6ae02

https://github.com/square/okhttp/compare/0766369844b26f64fc2e8d551ee8b5b00aa3fd87...9a35caf73356aa9a0142f5c5a0c50fde60d6ae02

diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java index 9947da037..144ec78f4 100644 --- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java +++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java @@ -41,7 +41,7 @@ public final class HeadersTest { SpdyTransport.readNameValueBlock(headerBlock, Protocol.SPDY_3).request(request).build(); Headers headers = response.headers(); assertEquals(4, headers.size()); - assertEquals(Protocol.HTTP_1_1, response.protocol()); + assertEquals(Protocol.SPDY_3, response.protocol()); assertEquals(200, response.code()); assertEquals("OK", response.message()); assertEquals("no-cache, no-store", headers.get("cache-control")); diff --git a/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java b/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java index 38ad43817..14f317ba9 100644 --- a/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java +++ b/okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java @@ -204,7 +204,7 @@ public final class SpdyTransport implements Transport { StatusLine statusLine = StatusLine.parse(version + " " + status); return new Response.Builder() - .protocol(statusLine.protocol) + .protocol(protocol) .code(statusLine.code) .message(statusLine.message) .headers(headersBuilder.build());

['okhttp/src/main/java/com/squareup/okhttp/internal/http/SpdyTransport.java', 'okhttp-tests/src/test/java/com/squareup/okhttp/internal/http/HeadersTest.java']

{'.java': 2}

Kotlin

{'Kotlin': 3059143, 'Java': 744989, 'Shell': 2995}

Apache License 2.0

dbeaver/dbeaver/12953/12943

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12943

https://github.com/dbeaver/dbeaver/pull/12953

https://github.com/dbeaver/dbeaver/pull/12953

fix

Database Navigator "Show Connected Only", "Show All" toggle no longer works

#### System information: - Operating system (distribution) and version Windows 10 Enterprise version 1909 - DBeaver version Community 21.1.1.202106210824 - Java version - Additional extensions #### Connection specification: - Database name and version postgres 13.* - Driver name - Do you use tunnels or proxies (SSH, SOCKS, etc)? #### Describe the problem you're observing: [Database Navigator], top right side, button to toggle between showing all connections and showing connected only stopped working with yesterday's upgrade to Community 21.1.1.202106210824 #### Steps to reproduce, if exist: #### Include any warning/errors/backtraces from the logs <none> Functionality has not worked today and there are no errors in the logs from today.

7176cb483b61f6c3db2668dbb13df49876a4c1f0

cb54f75baa3c1c7c1b1ba18d41e97ca82313fe53

https://github.com/dbeaver/dbeaver/compare/7176cb483b61f6c3db2668dbb13df49876a4c1f0...cb54f75baa3c1c7c1b1ba18d41e97ca82313fe53

diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java index 749c8113a7..a6c2863f9a 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java @@ -714,6 +714,8 @@ public class DatabaseNavigatorTree extends Composite implements INavigatorListen } pattern = "*" + pattern; this.matcher = new TextMatcherExt(pattern, true, false); + } else { + super.setPattern(null); } } @@ -725,13 +727,10 @@ public class DatabaseNavigatorTree extends Composite implements INavigatorListen if (matcher != null) { return matcher.match(text); } - return false; + return super.wordMatches(text); } public boolean isElementVisible(Viewer viewer, Object element){ - if (matcher == null) { - return true; - } if (filterShowConnected && element instanceof DBNDataSource && !((DBNDataSource) element).getDataSourceContainer().isConnected()) { return false; } diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/TextMatcherExt.java b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/TextMatcherExt.java index 7a5d7d0710..6b4a5dffe0 100644 --- a/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/TextMatcherExt.java +++ b/plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/TextMatcherExt.java @@ -68,6 +68,7 @@ public class TextMatcherExt { if (s == null || s.isEmpty()) { continue; } + s = "*" + s; StringMatcher m = new StringMatcher(s, ignoreCase, ignoreWildCards); m.usePrefixMatch(); matchers.add(m);

['plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/TextMatcherExt.java', 'plugins/org.jkiss.dbeaver.ui.navigator/src/org/jkiss/dbeaver/ui/navigator/database/DatabaseNavigatorTree.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/12939/12070

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12070

https://github.com/dbeaver/dbeaver/pull/12939

https://github.com/dbeaver/dbeaver/pull/12939

fix

[mysql] incorrect handling of stored procedure and function with the same name

- Operating system (distribution) and version: Debian 10 - DBeaver version: 21.0.2 - Database name and version: mysql 8.0.23 - Driver name: MySQL If there are one stored procedure and one function with the same name, you could loose function while editing the procedure. 1) create "test" PROCEDURE ``` DELIMITER $$ $$ CREATE PROCEDURE testdb.test() BEGIN END$$ DELIMITER ; ``` 2) create "test" FUNCTION ``` DELIMITER $$ $$ CREATE FUNCTION testdb.test() RETURNS INT DETERMINISTIC BEGIN RETURN 0; END$$ DELIMITER ; ``` 3) open the procedure, edit and save. CTRL+S generates the correct code: ``` DROP PROCEDURE IF EXISTS testdb.test; DELIMITER $$ $$ CREATE DEFINER=`root`@`localhost` PROCEDURE `testdb`.`test`() BEGIN # test END$$ DELIMITER ; ``` 4) edit the procedure again and press CTRL+S.... boom: DROP **FUNCTION** IF EXISTS testdb.test; DELIMITER $$ $$ CREATE DEFINER=`root`@`localhost` PROCEDURE `testdb`.`test`() BEGIN # test 1 END$$ DELIMITER ; As you can see the second time you save, there is a DROP FUNCTION and CREATE PROCEDURE, so "test" function is deleted.

9825b1f323d73718b7e685dea501fdbd7387410d

9c46c6f8bd6d6b5a5db4aea769a63663699c912f

https://github.com/dbeaver/dbeaver/compare/9825b1f323d73718b7e685dea501fdbd7387410d...9c46c6f8bd6d6b5a5db4aea769a63663699c912f

diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java index 3b2caa3e88..c6ad2fa070 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java @@ -923,12 +923,15 @@ public class MySQLCatalog implements "SELECT * FROM " + MySQLConstants.META_TABLE_ROUTINES + "\\nWHERE " + MySQLConstants.COL_ROUTINE_SCHEMA + "=?" + (object == null && objectName == null ? "" : " AND " + MySQLConstants.COL_ROUTINE_NAME + "=?") + - "\\nAND ROUTINE_TYPE IN ('PROCEDURE','FUNCTION')" + + " AND ROUTINE_TYPE" + (object == null ? " IN ('PROCEDURE','FUNCTION')" : "=?") + "\\nORDER BY " + MySQLConstants.COL_ROUTINE_NAME ); dbStat.setString(1, owner.getName()); if (object != null || objectName != null) { dbStat.setString(2, object != null ? object.getName() : objectName); + if (object != null) { + dbStat.setString(3, String.valueOf(object.getProcedureType())); + } } return dbStat; } diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLProcedure.java b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLProcedure.java index bf1cf13f76..4b98d7f7e3 100644 --- a/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLProcedure.java +++ b/plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLProcedure.java @@ -20,10 +20,7 @@ import org.jkiss.code.NotNull; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.Log; import org.jkiss.dbeaver.ext.mysql.MySQLConstants; -import org.jkiss.dbeaver.model.DBPDataKind; -import org.jkiss.dbeaver.model.DBPEvaluationContext; -import org.jkiss.dbeaver.model.DBPRefreshableObject; -import org.jkiss.dbeaver.model.DBUtils; +import org.jkiss.dbeaver.model.*; import org.jkiss.dbeaver.model.exec.jdbc.JDBCPreparedStatement; import org.jkiss.dbeaver.model.exec.jdbc.JDBCResultSet; import org.jkiss.dbeaver.model.exec.jdbc.JDBCSession; @@ -44,7 +41,7 @@ import java.util.Map; /** * MySQLProcedure */ -public class MySQLProcedure extends AbstractProcedure<MySQLDataSource, MySQLCatalog> implements MySQLSourceObject, DBPRefreshableObject +public class MySQLProcedure extends AbstractProcedure<MySQLDataSource, MySQLCatalog> implements MySQLSourceObject, DBPRefreshableObject, DBPUniqueObject { private static final Log log = Log.getLog(MySQLProcedure.class); @@ -263,6 +260,15 @@ public class MySQLProcedure extends AbstractProcedure<MySQLDataSource, MySQLCata return getContainer().proceduresCache.refreshObject(monitor, getContainer(), this); } + @NotNull + @Override + public String getUniqueName() { + if (getProcedureType() == DBSProcedureType.PROCEDURE) { + return getName() + ' ' + getResultType(); + } + return getName(); + } + @Override public String toString() { return procedureType.name() + " " + getName();

['plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLCatalog.java', 'plugins/org.jkiss.dbeaver.ext.mysql/src/org/jkiss/dbeaver/ext/mysql/model/MySQLProcedure.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/12766/12765

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12765

https://github.com/dbeaver/dbeaver/pull/12766

https://github.com/dbeaver/dbeaver/pull/12766

fix

SqlServer FK between two schemas doesn't show on UI

<!-- Thank you for reporting an issue. *IMPORTANT* - *before* creating a new issue please look around: - DBeaver documentation: https://github.com/dbeaver/dbeaver/wiki and - open issues in Github tracker: https://github.com/dbeaver/dbeaver/issues If you cannot find a similar problem, then create a new issue. Short tips about new issues can be found here: https://github.com/dbeaver/dbeaver/wiki/Posting-issues Please, do not create issue duplicates. If you find the same or similar issue, just add a comment or vote for this feature. It helps us to track the most popular requests and fix them faster. Please fill in as much of the template as possible. --> #### System information: - Operating system: **Windows 10 Version 21H1 Build 19043.1023** - DBeaver version **21.1.0.202105300349** Community - Additional extensions DBeaver Git support 1.0.46.202106012023 org.jkiss.dbeaver.git.feature.feature.group DBeaver Corp DevStyle (includes Darkest Dark Theme) 1.11.0.202105260439 com.genuitec.eclipse.theming.core.feature.feature.group Genuitec, LLC #### Connection specification: - Database name and version: **SqlServer Express Microsoft SQL Server 2017 (RTM-GDR) (KB4583456) - 14.0.2037.2 (X64) Nov 2 2020 19:19:59 Copyright (C) 2017 Microsoft Corporation Express Edition (64-bit) on Windows 10 Pro 10.0 <X64> (Build 19043: ) (Hypervisor)** - Driver name **SQL Server** - Do you use tunnels or proxies (SSH, SOCKS, etc)? **No** #### Describe the problem you're observing: Creating foreign keys between two tables on two different schemas via UI or SQL Script does not show it on Foreign Keys Tab/SubGroup neither on the DDL source tab. #### Steps to reproduce, if exist: 1. Create a SQL Server database 2. Create two schemas 3. Create TableOne on schema1 4. Create TableTwo on schema2 5. Create FK from TableTwo to TableOne 6. If you create FK with UI from the Foreign Keys tab when click persist the FK disappear (but is still present on DB) 7. Execute the query `select * from sys.objects` to verify that the object is successfully created

63aee4269a199deb69359f4913055615619a7666

0e820df3b91ff92f3c37db90335d30703afde0fd

https://github.com/dbeaver/dbeaver/compare/63aee4269a199deb69359f4913055615619a7666...0e820df3b91ff92f3c37db90335d30703afde0fd

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java index dac1924bb9..e41e19e4ef 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java @@ -216,10 +216,22 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi return tableCache.getTypedObjects(monitor, this, SQLServerTable.class); } + @Nullable public SQLServerTableBase getTable(DBRProgressMonitor monitor, String name) throws DBException { return tableCache.getObject(monitor, this, name); } + @Nullable + public SQLServerTable getTable(DBRProgressMonitor monitor, long tableId) throws DBException { + for (SQLServerTableBase table : tableCache.getAllObjects(monitor, this)) { + if (table.getObjectId() == tableId && table instanceof SQLServerTable) { + return (SQLServerTable) table; + } + } + log.debug("Table '" + tableId + "' not found in schema " + getName()); + return null; + } + @Association public Collection<SQLServerView> getViews(DBRProgressMonitor monitor) throws DBException { return tableCache.getTypedObjects(monitor, this, SQLServerView.class); @@ -659,7 +671,7 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi return null; } long refTableId = JDBCUtils.safeGetLong(dbResult, "referenced_object_id"); - SQLServerTable refTable = getTable(monitor, refTableId); + SQLServerTable refTable = refSchema.getTable(monitor, refTableId); if (refTable == null) { log.debug("Ref table " + refTableId + " not found in schema " + refSchema.getName()); return null; @@ -684,17 +696,6 @@ public class SQLServerSchema implements DBSSchema, DBPSaveableObject, DBPQualifi return new SQLServerTableForeignKey(parent, fkName, null, refConstraint, deleteRule, updateRule, true); } - @Nullable - private SQLServerTable getTable(DBRProgressMonitor monitor, long tableId) throws DBException { - for (SQLServerTableBase table: tableCache.getAllObjects(monitor, SQLServerSchema.this)) { - if (table.getObjectId() == tableId && table instanceof SQLServerTable) { - return (SQLServerTable) table; - } - } - log.debug("Table '" + tableId + "' not found in schema " + getName()); - return null; - } - @Nullable @Override protected SQLServerTableForeignKeyColumn[] fetchObjectRow(

['plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerSchema.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/12577/12576

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12576

https://github.com/dbeaver/dbeaver/pull/12577

https://github.com/dbeaver/dbeaver/pull/12577

fix

Inconsistent behavior of some checkboxes on the PostgreSQL connection configuration page

On the aforementioned page, we have 3 checkboxes: a) Show all databases; b) Show template databases; c) Show databases not available for connection. If the first one is not set, the latter two are not applicable. However, if we check one of them, e.g. the second one, and then we uncheck the first one, checkbox b is still set (but grayed). We also have the same checkboxes in the global preferences, and there we can even apply checkboxes b and c without checking button a.

a4afc250c8dc2566f43c7352e4aba539db7b8e23

4ae933837845b1c564859b676464fe7c83b18f9a

https://github.com/dbeaver/dbeaver/compare/a4afc250c8dc2566f43c7352e4aba539db7b8e23...4ae933837845b1c564859b676464fe7c83b18f9a

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPageAdvanced.java b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPageAdvanced.java index 3d86556b1b..4529685533 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPageAdvanced.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPageAdvanced.java @@ -84,8 +84,7 @@ public class PostgreConnectionPageAdvanced extends ConnectionPageAbstract showNonDefault.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - showTemplates.setEnabled(showNonDefault.getSelection()); - showUnavailable.setEnabled(showNonDefault.getSelection()); + setCheckboxesState(); } }); showTemplates = UIUtils.createCheckbox(secureGroup, PostgreMessages.dialog_setting_connection_show_templates, PostgreMessages.dialog_setting_connection_show_templates_tip, false, 2); @@ -125,6 +124,16 @@ public class PostgreConnectionPageAdvanced extends ConnectionPageAbstract loadSettings(); } + private void setCheckboxesState() { + boolean enable = showNonDefault.getSelection(); + if (!enable) { + showUnavailable.setSelection(false); + showTemplates.setSelection(false); + } + showUnavailable.setEnabled(enable); + showTemplates.setEnabled(enable); + } + @Override public boolean isComplete() { @@ -145,11 +154,10 @@ public class PostgreConnectionPageAdvanced extends ConnectionPageAbstract showTemplates.setSelection( CommonUtils.getBoolean(connectionInfo.getProviderProperty(PostgreConstants.PROP_SHOW_TEMPLATES_DB), globalPrefs.getBoolean(PostgreConstants.PROP_SHOW_TEMPLATES_DB))); - showTemplates.setEnabled(showNonDefault.getSelection()); showUnavailable.setSelection( CommonUtils.getBoolean(connectionInfo.getProviderProperty(PostgreConstants.PROP_SHOW_UNAVAILABLE_DB), globalPrefs.getBoolean(PostgreConstants.PROP_SHOW_UNAVAILABLE_DB))); - showUnavailable.setEnabled(showNonDefault.getSelection()); + setCheckboxesState(); showDatabaseStatistics.setSelection( CommonUtils.getBoolean(connectionInfo.getProviderProperty(PostgreConstants.PROP_SHOW_DATABASE_STATISTICS), globalPrefs.getBoolean(PostgreConstants.PROP_SHOW_DATABASE_STATISTICS))); diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PrefPagePostgreSQL.java b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PrefPagePostgreSQL.java index 9eb6ff68de..cfb96b1b4c 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PrefPagePostgreSQL.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PrefPagePostgreSQL.java @@ -79,8 +79,7 @@ public class PrefPagePostgreSQL extends AbstractPrefPage implements IWorkbenchPr showNonDefault.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - showTemplates.setEnabled(showNonDefault.getSelection()); - showUnavailable.setEnabled(showNonDefault.getSelection()); + setCheckboxesState(); } }); showTemplates = UIUtils.createCheckbox(secureGroup, @@ -95,6 +94,7 @@ public class PrefPagePostgreSQL extends AbstractPrefPage implements IWorkbenchPr globalPrefs.getBoolean(PostgreConstants.PROP_SHOW_UNAVAILABLE_DB), 2 ); + setCheckboxesState(); showDatabaseStatistics = UIUtils.createCheckbox( secureGroup, PostgreMessages.dialog_setting_connection_database_statistics, @@ -129,6 +129,16 @@ public class PrefPagePostgreSQL extends AbstractPrefPage implements IWorkbenchPr return cfgGroup; } + private void setCheckboxesState() { + boolean enable = showNonDefault.getSelection(); + if (!enable) { + showUnavailable.setSelection(false); + showTemplates.setSelection(false); + } + showUnavailable.setEnabled(enable); + showTemplates.setEnabled(enable); + } + @Override public boolean performOk() { DBPPreferenceStore preferenceStore = DBWorkbench.getPlatform().getPreferenceStore();

['plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PostgreConnectionPageAdvanced.java', 'plugins/org.jkiss.dbeaver.ext.postgresql.ui/src/org/jkiss/dbeaver/ext/postgresql/ui/PrefPagePostgreSQL.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/12571/12569

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12569

https://github.com/dbeaver/dbeaver/pull/12571

https://github.com/dbeaver/dbeaver/pull/12571

fix

Probable regression, Postgresql sequence DDL uses Cache 0 and this is not a valid value

#### System information: - Ubuntu 18.04 - DBeaver CE 21.0.5 - Additional extensions: Non AFAIK #### Connection specification: - Database name and version: PostgreSQL 9.6 - Driver name: PostgreSQL JDBC Driver - Do you use tunnels or proxies (SSH, SOCKS, etc)? No #### Describe the problem you're observing: The DDL suggested for a sequence sets optional attribute CACHE to 0 which is not valid in PostgreSQL. This was reported and supposedly fixed a couple of years ago in #5156 . #### Steps to reproduce, if exist: Create a sequence in a PostgreSQL DB and check the DDL that DBeaver shows. #### Include any warning/errors/backtraces from the logs <!-- Please, find the short guide how to find logs here: https://github.com/dbeaver/dbeaver/wiki/Log-files -->

67d9e76022d6a32ac090e12f2e25d82ec1726fe3

c170fae1c16ce0ef9287d3419de48541385eb1f1

https://github.com/dbeaver/dbeaver/compare/67d9e76022d6a32ac090e12f2e25d82ec1726fe3...c170fae1c16ce0ef9287d3419de48541385eb1f1

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSequence.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSequence.java index dd58352562..57c44bda18 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSequence.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSequence.java @@ -253,13 +253,29 @@ public class PostgreSequence extends PostgreTableBase implements DBSSequence, DB AdditionalInfo info = getAdditionalInfo(monitor); StringBuilder sql = new StringBuilder() .append("-- DROP SEQUENCE ").append(getFullyQualifiedName(DBPEvaluationContext.DDL)).append(";\\n\\n") - .append("CREATE SEQUENCE ").append(getFullyQualifiedName(DBPEvaluationContext.DDL)) - .append("\\n\\tINCREMENT BY ").append(info.getIncrementBy()) - .append("\\n\\tMINVALUE ").append(info.getMinValue()) - .append("\\n\\tMAXVALUE ").append(info.getMaxValue()) - .append("\\n\\tSTART ").append(info.getStartValue()) - .append("\\n\\tCACHE ").append(info.getCacheValue()) - .append("\\n\\t").append(info.isCycled ? "" : "NO ").append("CYCLE;"); + .append("CREATE SEQUENCE ").append(getFullyQualifiedName(DBPEvaluationContext.DDL)); + + if (info.getIncrementBy() > 0) { + sql.append("\\n\\tINCREMENT BY ").append(info.getIncrementBy()); + } + if (info.getMinValue() > 0) { + sql.append("\\n\\tMINVALUE ").append(info.getMinValue()); + } else { + sql.append("\\n\\tNO MINVALUE"); + } + if (info.getMaxValue() > 0) { + sql.append("\\n\\tMAXVALUE ").append(info.getMaxValue()); + } else { + sql.append("\\n\\tNO MAXVALUE"); + } + if (info.getStartValue() > 0) { + sql.append("\\n\\tSTART ").append(info.getStartValue()); + } + if (info.getCacheValue() > 0) { + sql.append("\\n\\tCACHE ").append(info.getCacheValue()); + sql.append("\\n\\t").append(info.isCycled ? "" : "NO ").append("CYCLE"); + } + sql.append(';'); if (!CommonUtils.isEmpty(getDescription())) { sql.append("\\nCOMMENT ON SEQUENCE ").append(DBUtils.getQuotedIdentifier(this)).append(" IS ")

['plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreSequence.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/13321/11973

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/11973

https://github.com/dbeaver/dbeaver/pull/13321

https://github.com/dbeaver/dbeaver/pull/13321

fix

Filters don't work for enum types

PostgreSQL 12, DBeaver EE 21.0.0, macOS 11.2.3. Suppose we have a enum type and a table: ```sql CREATE TYPE "mood" AS ENUM ( 'sad', 'ok', 'happy' ); CREATE TABLE mood_data ( id int4 NOT NULL GENERATED ALWAYS AS IDENTITY, "time" timestamp NULL, "mood" "mood" NULL, CONSTRAINT mood_data_pkey PRIMARY KEY (id) ); ``` Fill the table with data. Open the data editor and try to apply a filter on the `mood` column. Possible values for filtering will be duplicated, the data editor will be closed with an error when applying the filter.

86adfaeec2af0cf11b43114cfb25f316830489fd

01ddb8e9c02c212e4179295aa37381a9944d6621

https://github.com/dbeaver/dbeaver/compare/86adfaeec2af0cf11b43114cfb25f316830489fd...01ddb8e9c02c212e4179295aa37381a9944d6621

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java index 9fede8aa6a..3558b73b3c 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java @@ -496,6 +496,12 @@ class GenericFilterValueEdit { } private DBDLabelValuePair findValue(Map<Object, DBDLabelValuePair> rowData, Object cellValue) { + final DBDLabelValuePair value = rowData.get(cellValue); + if (value != null) { + // If we managed to found something at this point - return right away + return value; + } + // Otherwise try to match values manually if (cellValue instanceof Number) { for (Map.Entry<Object, DBDLabelValuePair> pair : rowData.entrySet()) { if (pair.getKey() instanceof Number && CommonUtils.compareNumbers((Number) pair.getKey(), (Number) cellValue) == 0) { @@ -503,7 +509,14 @@ class GenericFilterValueEdit { } } } - return rowData.get(cellValue); + if (cellValue instanceof String) { + for (Map.Entry<Object, DBDLabelValuePair> pair : rowData.entrySet()) { + if (!DBUtils.isNullValue(pair.getKey()) && CommonUtils.toString(pair.getKey()).equals(cellValue)) { + return pair.getValue(); + } + } + } + return null; } @Nullable

['plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/valuefilter/GenericFilterValueEdit.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/14078/10955

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/10955

https://github.com/dbeaver/dbeaver/pull/14078

https://github.com/dbeaver/dbeaver/pull/14078

fix

Auto-complete offers objects from the current schema only

#### System information: - Operating system (distribution) and version Win10 - DBeaver version 7.3.3 EA #### Steps to reproduce, if exist: 1. Open SQL Editor for MySQL sakila 2. Type `select * from a` **Actual result**: the list for auto-complete appears with objects from the current schema only **Expected**: the objects are offered from the whole database if they are suitable for auto-complete in the current statement. _Note_: enabled **Use global search** option doesn't solve the issue

19a37d839f97bb022c19ddc6fff588b230f92786

e5219c457984fa0ef078968c11b7c835a3526142

https://github.com/dbeaver/dbeaver/compare/19a37d839f97bb022c19ddc6fff588b230f92786...e5219c457984fa0ef078968c11b7c835a3526142

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java index 68edb2d22e..9be288abeb 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java @@ -128,7 +128,7 @@ public class SQLServerStructureAssistant implements DBSStructureAssistant<SQLSer Collection<SQLServerDatabase> databases; SQLServerSchema schema = null; - if (parentObject instanceof DBPDataSourceContainer) { + if (parentObject instanceof DBPDataSourceContainer || parentObject instanceof SQLServerDataSource) { if (globalSearch) { databases = executionContext.getDataSource().getDatabases(monitor); } else {

['plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/model/SQLServerStructureAssistant.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/14732/12335

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12335

https://github.com/dbeaver/dbeaver/pull/14732

https://github.com/dbeaver/dbeaver/pull/14732

fix

Autocompletion doesn't work in some JOIN cases.

#### System information: - Windows 10 Pro x64 - DBeaver 21.0.4 - No additional extensions #### Connection specification: - PostgreSQL 9.5 - Default PostgreSQL driver - No tunnels or proxies #### Describe the problem you're observing: Column autocompletion doesn't work when table in from clause doesn't have alias #### Steps to reproduce, if exist: https://user-images.githubusercontent.com/22142845/116897332-cdc2a480-ac3d-11eb-8f1b-5f8d6e5ebee0.mp4

aa2e00bbde05b2fb5e993b05298ad4e4d2fc2ca1

661dc850cef16f395a746f811fab55de36107ee8

https://github.com/dbeaver/dbeaver/compare/aa2e00bbde05b2fb5e993b05298ad4e4d2fc2ca1...661dc850cef16f395a746f811fab55de36107ee8

diff --git a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java index 33ecaf1292..15bb14763d 100644 --- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java +++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java @@ -932,8 +932,16 @@ public class SQLCompletionAnalyzer implements DBRRunnableParametrized<DBRProgres continue; } if (state == InlineState.TABLE_DOT) { - if (CommonUtils.isEmpty(tableAlias)) { + if (CommonUtils.isEmpty(tableAlias) && !isTableQueryToken(tok, value)) { state = InlineState.MATCHED; + } else if (isTableQueryToken(tok, value)) { + /* + Sometimes we can have table without alias, it will reset state to table_name because there is no alias to check + See #12335 + */ + matchedTableName = null; + state = InlineState.TABLE_NAME; + continue; } else { state = InlineState.ALIAS_AS; } diff --git a/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/analyzer/SQLCompletionAnalyzerTest.java b/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/analyzer/SQLCompletionAnalyzerTest.java index 7a03a6a672..26a363327b 100644 --- a/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/analyzer/SQLCompletionAnalyzerTest.java +++ b/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/analyzer/SQLCompletionAnalyzerTest.java @@ -147,6 +147,30 @@ public class SQLCompletionAnalyzerTest { } } + @Test + public void testColumnWithNonExistingAliases() throws DBException { + final RequestResult request = RequestBuilder.tables(s-> { + s.table("Table1", t -> { + t.attribute("Col1"); + t.attribute("Col2"); + }); + s.table("Table2", t -> { + t.attribute("Col4"); + t.attribute("Col5"); + }); + }).prepare(); + { + final List<SQLCompletionProposalBase> proposals = request.request("SELECT * FROM Table1 join Table2 t on t.|", false); + Assert.assertEquals("Col4", proposals.get(0).getReplacementString()); + Assert.assertEquals("Col5", proposals.get(1).getReplacementString()); + } + { + final List<SQLCompletionProposalBase> proposals = request.request("SELECT * FROM Table1 b join Table2 on b.|", false); + Assert.assertEquals("Col1", proposals.get(0).getReplacementString()); + Assert.assertEquals("Col2", proposals.get(1).getReplacementString()); + } + } + @Test public void testColumnNamesExpandCompletion() throws DBException { final RequestResult request = RequestBuilder

['plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/completion/SQLCompletionAnalyzer.java', 'test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/analyzer/SQLCompletionAnalyzerTest.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/14902/14010

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/14010

https://github.com/dbeaver/dbeaver/pull/14902

https://github.com/dbeaver/dbeaver/pull/14902

fix

Support JSONExtractKeysAndValuesRaw feature in Clickhouse

Hello! I use DBeaver 21.1.3.202107181810 with ClickHouse. And I have a problem with JSONExtractKeysAndValuesRaw feature: `SELECT JSONExtractKeysAndValuesRaw('{"id":67}')` Error: ``` org.jkiss.dbeaver.model.exec.DBCException: Can't extract array data from JDBC array at org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCollection.makeCollectionFromArray(JDBCCollection.java:267) at org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCArrayValueHandler.getValueFromObject(JDBCArrayValueHandler.java:64) at org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCArrayValueHandler.getValueFromObject(JDBCArrayValueHandler.java:1) at org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCComplexValueHandler.fetchColumnValue(JDBCComplexValueHandler.java:50) at org.jkiss.dbeaver.model.impl.jdbc.data.handlers.JDBCAbstractValueHandler.fetchValueObject(JDBCAbstractValueHandler.java:49) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetDataReceiver.fetchRow(ResultSetDataReceiver.java:125) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.fetchQueryData(SQLQueryJob.java:721) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.executeStatement(SQLQueryJob.java:544) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.lambda$0(SQLQueryJob.java:444) at org.jkiss.dbeaver.model.exec.DBExecUtils.tryExecuteRecover(DBExecUtils.java:171) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.executeSingleQuery(SQLQueryJob.java:431) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.extractData(SQLQueryJob.java:816) at org.jkiss.dbeaver.ui.editors.sql.SQLEditor$QueryResultsContainer.readData(SQLEditor.java:3435) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetJobDataRead.lambda$0(ResultSetJobDataRead.java:118) at org.jkiss.dbeaver.model.exec.DBExecUtils.tryExecuteRecover(DBExecUtils.java:171) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetJobDataRead.run(ResultSetJobDataRead.java:116) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer$ResultSetDataPumpJob.run(ResultSetViewer.java:4686) at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:105) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63) Caused by: org.jkiss.dbeaver.model.exec.DBCException: SQL Error at org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCollection.makeCollectionFromArray(JDBCCollection.java:251) ... 18 more Caused by: java.sql.SQLFeatureNotSupportedException at ru.yandex.clickhouse.ClickHouseArray.getResultSet(ClickHouseArray.java:65) at org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCollection.makeCollectionFromResultSet(JDBCCollection.java:367) at org.jkiss.dbeaver.model.impl.jdbc.data.JDBCCollection.makeCollectionFromArray(JDBCCollection.java:249) ... 18 more ``` Are there any plans to add support of this feature? It would be very useful. Thank you

a7980337756790411f2354e08b3286290669493c

0bb461d52d3c6228e8b3124f96689ea7c92183cf

https://github.com/dbeaver/dbeaver/compare/a7980337756790411f2354e08b3286290669493c...0bb461d52d3c6228e8b3124f96689ea7c92183cf

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCCollection.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCCollection.java index d2104bf043..b947bbd148 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCCollection.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCCollection.java @@ -237,30 +237,32 @@ public class JDBCCollection extends AbstractDatabaseList implements DBDValueClon } try { - if (elementType == null) { - if (array == null) { - // Null array of unknown type. Just make NULL read-only array - String defDataTypeName = dataSource.getDefaultDataTypeName(DBPDataKind.OBJECT); - DBSDataType defDataType = dataSource.getLocalDataType(defDataTypeName); - DBDValueHandler defValueHandler = session.getDefaultValueHandler(); - return new JDBCCollection(defDataType, defValueHandler, null); - } + if (elementType == null && array == null) { + // Null array of unknown type. Just make NULL read-only array + String defDataTypeName = dataSource.getDefaultDataTypeName(DBPDataKind.OBJECT); + DBSDataType defDataType = dataSource.getLocalDataType(defDataTypeName); + DBDValueHandler defValueHandler = session.getDefaultValueHandler(); + return new JDBCCollection(defDataType, defValueHandler, null); + } + + if (elementType != null) { try { - return makeCollectionFromResultSet(session, array, null); + return makeCollectionFromArray(session, array, elementType); } catch (SQLException e) { - throw new DBCException(e, session.getExecutionContext()); + if (array == null) { + throw new DBCException(e, session.getExecutionContext()); + } } } + try { - return makeCollectionFromArray(session, array, elementType); + return makeCollectionFromResultSet(session, array, null); } catch (SQLException e) { - if (array == null) { - throw new DBCException(e, session.getExecutionContext()); - } try { - return makeCollectionFromResultSet(session, array, elementType); - } catch (SQLException e1) { - throw new DBCException(e1, session.getExecutionContext()); + // Array of unknown type. + return makeCollectionFromJavaArray(session, array.getArray()); + } catch (SQLException ex) { + throw new DBCException(ex, session.getExecutionContext()); } } } catch (DBException e) { @@ -269,7 +271,7 @@ public class JDBCCollection extends AbstractDatabaseList implements DBDValueClon } @NotNull - public static JDBCCollection makeCollectionFromJavaArray(@NotNull JDBCSession session, @NotNull DBSTypedObject column, Object array) throws DBCException { + public static JDBCCollection makeCollectionFromJavaArray(@NotNull JDBCSession session, Object array) throws DBCException { DBSDataType elementType; DBPDataKind dataKind; DBPDataTypeProvider dataTypeProvider = session.getDataSource(); diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCArrayValueHandler.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCArrayValueHandler.java index 6d1b96a928..7f51dbb2a1 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCArrayValueHandler.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCArrayValueHandler.java @@ -65,7 +65,7 @@ public class JDBCArrayValueHandler extends JDBCComplexValueHandler { } else if (object instanceof String) { return JDBCCollection.makeCollectionFromString((JDBCSession) session, (String)object); } else if (object.getClass().isArray()) { - return JDBCCollection.makeCollectionFromJavaArray((JDBCSession) session, type, object); + return JDBCCollection.makeCollectionFromJavaArray((JDBCSession) session, object); } else if (object instanceof Collection) { return JDBCCollection.makeCollectionFromJavaCollection((JDBCSession) session, type, (Collection) object); } else {

['plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/handlers/JDBCArrayValueHandler.java', 'plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/data/JDBCCollection.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/14936/14187

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/14187

https://github.com/dbeaver/dbeaver/pull/14936

https://github.com/dbeaver/dbeaver/pull/14936

fix

SQL script editor bug when delete

#### System information: - Win 10 - 21.2.2.202110030714 - Additional extensions - #### Connection specification: - Postgresql 13 - org.postgresql.Driver (42.2.20) #### Describe the problem you're observing: 1. E.g. "SELECT id, c1, c2, c3 FROM table;" from SQL script window. 2. select a row and mark it for delete. 3. browse over the row limit (e.g. 200) 4. press "save" 5. the row doesn't deleted

9b10a1e99e8f8c60a65cdcba8dff8db606afed63

ded93ff8197261905aeba24d75e6030bc601bf69

https://github.com/dbeaver/dbeaver/compare/9b10a1e99e8f8c60a65cdcba8dff8db606afed63...ded93ff8197261905aeba24d75e6030bc601bf69

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java index bf66efb8b4..115d734f38 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java @@ -221,7 +221,15 @@ public class ResultSetViewer extends Viewer // Theme listener private IPropertyChangeListener themeChangeListener; private long lastThemeUpdateTime; + private boolean isCancelled = false; + public boolean isCancelled() { + return isCancelled; + } + + public void setCancelled(boolean cancelled) { + isCancelled = cancelled; + } public ResultSetViewer(@NotNull Composite parent, @NotNull IWorkbenchPartSite site, @NotNull IResultSetContainer container) { @@ -2256,9 +2264,6 @@ public class ResultSetViewer extends Viewer } void appendData(List<Object[]> rows, boolean resetOldRows) { - if (!checkForChanges()) { - return; - } model.appendData(rows, resetOldRows); UIUtils.asyncExec(() -> { @@ -3540,6 +3545,9 @@ public class ResultSetViewer extends Viewer public boolean checkForChanges() { // Check if we are dirty if (isDirty()) { + if (isCancelled){ + return false; + } int checkResult = new UITask<Integer>() { @Override protected Integer runTask() { @@ -3548,6 +3556,7 @@ public class ResultSetViewer extends Viewer }.execute(); switch (checkResult) { case ISaveablePart2.CANCEL: + isCancelled = true; return false; case ISaveablePart2.YES: // Apply changes @@ -4809,6 +4818,10 @@ public class ResultSetViewer extends Viewer return Status.CANCEL_STATUS; } beforeDataRead(); + if (!checkForChanges()){ + return Status.CANCEL_STATUS; + } + isCancelled = false; try { IStatus status = super.run(monitor); afterDataRead();

['plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetViewer.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/15089/13436

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/13436

https://github.com/dbeaver/dbeaver/pull/15089

https://github.com/dbeaver/dbeaver/pull/15089

fix

copy sql as source code for delphi and single quote

#### System information: - Windows 10 - DBeaver version 21.1.4.202108020335 - dark theme and office #### Describe the problem you're observing: when i use "copy sql as source code" and i don't select use string builder option the code generated have half cicle ")" in end of code. Delphi require string inside single quote at begin and end. Another problem is when i use single quote inside sql and generation of code. Single quote is in delphi a reserved charater for defining string . If i want use single quote in a string is necessary repeat single quote. #### Example code generate from dbaver 'SELECT COD_AGE_ID,STATO FROM mytable aa ' + 'where COD_AGE_ID = '00125' '); correct version in delphi 'SELECT COD_AGE_ID,STATO FROM mytable aa ' + 'where COD_AGE_ID = ''00125'' ';

3795b714f903eb25be17750d2f67ecf94186b6df

10f8607acbdccb6aed02df2a6f1f91caf8047994

https://github.com/dbeaver/dbeaver/compare/3795b714f903eb25be17750d2f67ecf94186b6df...10f8607acbdccb6aed02df2a6f1f91caf8047994

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/convert/impl/DelphiSQLConverter.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/convert/impl/DelphiSQLConverter.java index bcbfb0a563..ecfa7173f5 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/convert/impl/DelphiSQLConverter.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/convert/impl/DelphiSQLConverter.java @@ -40,6 +40,7 @@ public class DelphiSQLConverter extends SourceCodeSQLConverter { result.append("Query.Add("); } String line = sourceLines[i]; + line = line.replace("'", "''"); result.append('\\'').append(CommonUtils.escapeJavaString(line)); if (!trailingLineFeed) { result.append(lineDelimiter); @@ -48,9 +49,9 @@ public class DelphiSQLConverter extends SourceCodeSQLConverter { if (trailingLineFeed) { result.append(lineDelimiter); } - if ((i < sourceLines.length - 1) && (!useStringBuilder)) { + if (i < sourceLines.length - 1 && !useStringBuilder) { result.append(" + \\n"); - } else { + } else if (useStringBuilder){ result.append(");\\n"); } }

['plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/convert/impl/DelphiSQLConverter.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/15183/15158

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/15158

https://github.com/dbeaver/dbeaver/pull/15183

https://github.com/dbeaver/dbeaver/pull/15183

fix

Advanced Copy as SQL doesn't copy table name as case sensitive

#### System information: - Operating system (distribution) and version: MacOS Monterey - DBeaver version: 21.3.2 Community #### Connection specification: - Database name and version: Postgres 12 - Driver name: PostgreSQL JDBC Driver - Do you use tunnels or proxies (SSH, SOCKS, etc)? No #### Describe the problem you're observing: When copying result row in order to get an insert SQL statement the table name is not copied with double quotes and proper (case sensitive) table name. Example table name "investmentRounds" is copied as "investmentrounds" and without quotes. This kind of statement doesn't work and the name of the table must be corrected. #### Steps to reproduce, if exist: 1. Select some data 2. Highlight a row in the results tab 3. Right click -> Advanced Copy -> Copy as SQL 4. Paste in editor and notice the table name to be all lower case

acac6596149745c7bc12f417d159563c9d9374a6

a8fc093bf529f51b005e7bc1f53fb620d3fadecf

https://github.com/dbeaver/dbeaver/compare/acac6596149745c7bc12f417d159563c9d9374a6...a8fc093bf529f51b005e7bc1f53fb620d3fadecf

diff --git a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DTUtils.java b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DTUtils.java index 1b0824c937..6c5acdcd86 100644 --- a/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DTUtils.java +++ b/plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DTUtils.java @@ -103,7 +103,7 @@ public class DTUtils { public static String getTableNameFromQuery(DBPDataSource dataSource, SQLQueryContainer queryContainer, boolean shortName) { SQLScriptElement query = queryContainer.getQuery(); if (query instanceof SQLQuery) { - DBCEntityMetaData singleSource = ((SQLQuery) query).getSingleSource(); + DBCEntityMetaData singleSource = ((SQLQuery) query).getEntityMetadata(true); if (singleSource != null) { SQLDialect dialect = dataSource.getSQLDialect(); String entity = transformName(dialect, singleSource.getEntityName()); diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java index dca19c4b62..0a916b991e 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java @@ -312,7 +312,7 @@ public class SQLServerUtils { } public static SQLServerTableBase getTableFromQuery(DBCSession session, SQLQuery sqlQuery, SQLServerDataSource dataSource) throws DBException, SQLException { - DBCEntityMetaData singleSource = sqlQuery.getSingleSource(); + DBCEntityMetaData singleSource = sqlQuery.getEntityMetadata(false); String catalogName = null; if (singleSource != null) { catalogName = singleSource.getCatalogName(); diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java index bc75ed5d9d..d9e1ec995d 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java @@ -640,7 +640,7 @@ public class DBExecUtils { Object sourceDescriptor = executionSource.getSourceDescriptor(); if (sourceDescriptor instanceof SQLQuery) { sqlQuery = (SQLQuery) sourceDescriptor; - entityMeta = sqlQuery.getSingleSource(); + entityMeta = sqlQuery.getEntityMetadata(false); } if (entityMeta != null) { entity = DBUtils.getEntityFromMetaData(monitor, session.getExecutionContext(), entityMeta); diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQuery.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQuery.java index 202b585fe1..26300584f1 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQuery.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQuery.java @@ -73,7 +73,7 @@ public class SQLQuery implements SQLScriptElement { @NotNull private SQLQueryType type; private Statement statement; - private SingleTableMeta singleTableMeta; + private SingleTableMeta singleTableMeta, rawSingleTableMetadata; private List<SQLSelectItem> selectItems; private String queryTitle; @@ -214,18 +214,27 @@ public class SQLQuery implements SQLScriptElement { } private void fillSingleSource(Table fromItem) { - singleTableMeta = createTableMetaData(fromItem); + rawSingleTableMetadata = createOriginalSourceTableMetaData(fromItem); + singleTableMeta = createUnquotedTableMetaData(rawSingleTableMetadata); } SingleTableMeta createTableMetaData(Table fromItem) { + return createUnquotedTableMetaData(createOriginalSourceTableMetaData(fromItem)); + } + + private SingleTableMeta createOriginalSourceTableMetaData(Table fromItem) { Database database = fromItem.getDatabase(); String catalogName = database == null ? null : database.getDatabaseName(); String schemaName = fromItem.getSchemaName(); String tableName = fromItem.getName(); + return new SingleTableMeta(catalogName, schemaName, tableName); + } + + private SingleTableMeta createUnquotedTableMetaData(SingleTableMeta tableMeta) { return new SingleTableMeta( - unquoteIdentifier(catalogName), - unquoteIdentifier(schemaName), - unquoteIdentifier(tableName)); + unquoteIdentifier(tableMeta.getCatalogName()), + unquoteIdentifier(tableMeta.getSchemaName()), + unquoteIdentifier(tableMeta.getEntityName())); } private String unquoteIdentifier(String name) { @@ -345,9 +354,9 @@ public class SQLQuery implements SQLScriptElement { return type; } - public DBCEntityMetaData getSingleSource() { + public DBCEntityMetaData getEntityMetadata(boolean raw) { parseQuery(); - return singleTableMeta; + return raw? rawSingleTableMetadata : singleTableMeta; } public void setParameters(List<SQLQueryParameter> parameters) { diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java index d74ccca8ee..71d5be0d3a 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java @@ -2295,8 +2295,8 @@ public class SQLEditor extends SQLEditorBase implements SQLQuery query = (SQLQuery) queries.get(0); if (query.isDeleteUpdateDangerous()) { String targetName = "multiple tables"; - if (query.getSingleSource() != null) { - targetName = query.getSingleSource().getEntityName(); + if (query.getEntityMetadata(false) != null) { + targetName = query.getEntityMetadata(false).getEntityName(); } if (ConfirmationDialog.showConfirmDialogEx( ResourceBundle.getBundle(SQLEditorMessages.BUNDLE_NAME),

['plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/SQLServerUtils.java', 'plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java', 'plugins/org.jkiss.dbeaver.data.transfer/src/org/jkiss/dbeaver/tools/transfer/DTUtils.java', 'plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQuery.java', 'plugins/org.jkiss.dbeaver.ui.editors.sql/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java']

{'.java': 5}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/15184/14296

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/14296

https://github.com/dbeaver/dbeaver/pull/15184

https://github.com/dbeaver/dbeaver/pull/15184

fix

Oracle Alternative Quoting Mechanism Not Properly Ended

#### System information: - Windows 10 64-bit - DBeaver 21.2.3 - No additional extensions #### Connection specification: - Oracle Database 12c - Oracle JDBC driver 12.2.0.1 - No tunnels or proxies #### Describe the problem you're observing: Alternative quoting mechanism ("Q") for string literals is not working correctly when the alternative quoting character is repeated at the end of a string. #### Steps to reproduce: I execute this SQL statement: `SELECT q'!Test!!' FROM DUAL;` And get this error: > SQL Error [933] [42000]: ORA-00933: SQL command not properly ended If I first highlight the whole SQL statement or remove the semi-colon before executing it, it runs without errors and outputs: ``` Q'!TEST!!'| ----------+ Test! | ``` In both cases, the appearance is wrong with all of `' FROM DUAL;` being SQL string colour and `q'{{Test}}` not being so. Other scenarios: * If you add an odd number of quotes to the string (e.g. `q'!It's a test!!'`), it'll run fine but still appear wrong. * If the string has the alternative quoting character followed by a quote within it (e.g. `q'!Test!'!'`), it'll correctly throw an error. * If the character before the final alternative quoting character is anything else (e.g. `q'!Test! !'`), it'll both run and look fine. * If the string has an odd number of the alternative quoting characters (e.g. `q'!Test!!!'`), it'll both run and look fine. #### Include any warning/errors/backtraces from the logs ``` !ENTRY org.jkiss.dbeaver.model 4 0 2021-10-19 17:20:57.514 !MESSAGE SQL Error [933] [42000]: ORA-00933: SQL command not properly ended !SUBENTRY 1 org.jkiss.dbeaver.model 4 0 2021-10-19 17:20:57.515 !MESSAGE SQL Error [933] [42000]: ORA-00933: SQL command not properly ended !SUBENTRY 2 org.jkiss.dbeaver.model 4 0 2021-10-19 17:20:57.515 !MESSAGE Error : 933, Position : 27, Sql = SELECT q'!Test!!' FROM DUAL;, OriginalSql = SELECT q'!Test!!' FROM DUAL;, Error Msg = ORA-00933: SQL command not properly ended !STACK 0 Error : 933, Position : 27, Sql = SELECT q'!Test!!' FROM DUAL;, OriginalSql = SELECT q'!Test!!' FROM DUAL;, Error Msg = ORA-00933: SQL command not properly ended at oracle.jdbc.driver.T4CTTIoer11.processError(T4CTTIoer11.java:498) at oracle.jdbc.driver.T4CTTIoer11.processError(T4CTTIoer11.java:446) at oracle.jdbc.driver.T4C8Oall.processError(T4C8Oall.java:1054) at oracle.jdbc.driver.T4CTTIfun.receive(T4CTTIfun.java:623) at oracle.jdbc.driver.T4CTTIfun.doRPC(T4CTTIfun.java:252) at oracle.jdbc.driver.T4C8Oall.doOALL(T4C8Oall.java:612) at oracle.jdbc.driver.T4CStatement.doOall8(T4CStatement.java:213) at oracle.jdbc.driver.T4CStatement.doOall8(T4CStatement.java:37) at oracle.jdbc.driver.T4CStatement.executeForDescribe(T4CStatement.java:733) at oracle.jdbc.driver.OracleStatement.executeMaybeDescribe(OracleStatement.java:904) at oracle.jdbc.driver.OracleStatement.doExecuteWithTimeout(OracleStatement.java:1082) at oracle.jdbc.driver.OracleStatement.executeInternal(OracleStatement.java:1737) at oracle.jdbc.driver.OracleStatement.execute(OracleStatement.java:1692) at oracle.jdbc.driver.OracleStatementWrapper.execute(OracleStatementWrapper.java:300) at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCStatementImpl.execute(JDBCStatementImpl.java:330) at org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCStatementImpl.executeStatement(JDBCStatementImpl.java:130) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.executeStatement(SQLQueryJob.java:513) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.lambda$0(SQLQueryJob.java:444) at org.jkiss.dbeaver.model.exec.DBExecUtils.tryExecuteRecover(DBExecUtils.java:171) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.executeSingleQuery(SQLQueryJob.java:431) at org.jkiss.dbeaver.ui.editors.sql.execute.SQLQueryJob.extractData(SQLQueryJob.java:816) at org.jkiss.dbeaver.ui.editors.sql.SQLEditor$QueryResultsContainer.readData(SQLEditor.java:3462) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetJobDataRead.lambda$0(ResultSetJobDataRead.java:118) at org.jkiss.dbeaver.model.exec.DBExecUtils.tryExecuteRecover(DBExecUtils.java:171) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetJobDataRead.run(ResultSetJobDataRead.java:116) at org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer$ResultSetDataPumpJob.run(ResultSetViewer.java:4718) at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:105) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63) ```

7ed7fd29d5cd5793ede0313235bcf417bd72f461

e26f3c4e2fc1314e7f0a7792da974af726125700

https://github.com/dbeaver/dbeaver/compare/7ed7fd29d5cd5793ede0313235bcf417bd72f461...e26f3c4e2fc1314e7f0a7792da974af726125700

diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java index 60e3991bb7..6d27c76a92 100644 --- a/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java +++ b/plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java @@ -61,28 +61,9 @@ class OracleDialectRules implements TPRuleProvider { if (!Character.isLetterOrDigit(quoteStartChar)) { // Probably a Q-string char quoteEndChar = getQuoteEndChar(quoteStartChar); - int charsRead = 0; - boolean isQuote = true; - for (;;) { - c = scanner.read(); - charsRead++; - if (c == quoteEndChar) { - c = scanner.read(); - charsRead++; - if (c == '\\'') { - break; - } - } else if (c == TPCharacterScanner.EOF) { - isQuote = false; - break; - } - } - if (isQuote) { + + if (tryReadQString(scanner, quoteEndChar)) { return stringToken; - } else { - for (int i = 0; i < charsRead; i++) { - scanner.unread(); - } } } else { quoteStartChar = (char) -1; @@ -99,6 +80,26 @@ class OracleDialectRules implements TPRuleProvider { return TPTokenAbstract.UNDEFINED; } + private boolean tryReadQString(TPCharacterScanner scanner, char quoteEndChar) { + int charsRead = 0; + int prevChar = -1, currChar = -1; + boolean isEndOfLiteral, isEndOfText; + do { + prevChar = currChar; + currChar = scanner.read(); + charsRead++; + isEndOfLiteral = prevChar == quoteEndChar && currChar == '\\''; + isEndOfText = currChar == TPCharacterScanner.EOF; + } while (!isEndOfLiteral && !isEndOfText); + + if (isEndOfText) { + for (int i = 0; i < charsRead; i++) { + scanner.unread(); + } + } + return isEndOfLiteral; + } + private static char getQuoteEndChar(char startChar) { switch (startChar) { case '<': return '>';

['plugins/org.jkiss.dbeaver.ext.oracle/src/org/jkiss/dbeaver/ext/oracle/sql/OracleDialectRules.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/16854/16705

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/16705

https://github.com/dbeaver/dbeaver/pull/16854

https://github.com/dbeaver/dbeaver/pull/16854

closes

[Wayland] Data can't be edited inline after double click

#### System information: - Operating system (distribution) and version Ubuntu 22.04 - DBeaver version 22.1.0 #### Steps to reproduce, if exist: 1. Double-click on any cell in data editor 2. Input something **Expected:** Data in a cell is replaced with the input **Actual:** Nothing happens

cc530b2a5b86e4f0d38b03335d59c59865d0d12e

8fbd8d861a51a5cfb73530ea6fe7ddb7807a6f85

https://github.com/dbeaver/dbeaver/compare/cc530b2a5b86e4f0d38b03335d59c59865d0d12e...8fbd8d861a51a5cfb73530ea6fe7ddb7807a6f85

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java index 83f42eac12..8a3070d215 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java @@ -3130,7 +3130,13 @@ public abstract class LightGrid extends Canvas { // and therefore the grid has a child. The solution is to // forceFocus() if ((getStyle() & SWT.NO_FOCUS) != SWT.NO_FOCUS) { - forceFocus(); + GridPos cell = getCell(new Point(e.x, e.y)); + if (cell == null || !cell.equalsTo(getFocusPos())) { + // We don't want to call this event if the selected cell equals active one + // this is related to bug with wayland handling of force focus, which led to editors + // loosing focus on double click see #16705 + forceFocus(); + } } //if populated will be fired at end of method.

['plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/lightgrid/LightGrid.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/17319/16368

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/16368

https://github.com/dbeaver/dbeaver/pull/17319

https://github.com/dbeaver/dbeaver/pull/17319

fix

Azure Synapse Serverless: cannot read view definition

#### System information: - Windows 10 - DBeaver 22.0.3 #### Connection specification: - Database type: Azure Synapse "serverless" - Driver name: Azure SQL Server - No tunnels or proxies #### Describe the problem you're observing: Trying to get the DDL of a view produces a NullPointerException and the definition pane shows: ``` /* ERROR WHILE READING SOURCE: null */ ``` In version 22.0.0, view definitions could be obtained, see #15490. #### Steps to reproduce, if exist: - Open a view object in this type of database - Go to Properties -> Definition #### Include any warning/errors/backtraces from the logs Exception stack trace: java.lang.NullPointerException at org.jkiss.dbeaver.model.DBUtils.getQuotedIdentifier(DBUtils.java:78) at org.jkiss.dbeaver.ext.mssql.edit.SQLServerViewManager.createOrReplaceViewQuery(SQLServerViewManager.java:115) at org.jkiss.dbeaver.ext.mssql.edit.SQLServerViewManager.addObjectDeleteActions(SQLServerViewManager.java:91) at org.jkiss.dbeaver.model.impl.sql.edit.SQLObjectEditor$ObjectDeleteCommand.getPersistActions(SQLObjectEditor.java:401) at org.jkiss.dbeaver.model.impl.sql.edit.struct.SQLTableManager.getTableDDL(SQLTableManager.java:224) at org.jkiss.dbeaver.model.struct.DBStructUtils.generateTableDDL(DBStructUtils.java:89) at org.jkiss.dbeaver.model.struct.DBStructUtils.getTableDDL(DBStructUtils.java:116) at org.jkiss.dbeaver.model.struct.DBStructUtils.generateTableListDDL(DBStructUtils.java:176) at org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer.getSourceText(SQLSourceViewer.java:95) at org.jkiss.dbeaver.ui.editors.sql.SQLEditorNested$ObjectDocumentProvider$1.lambda$0(SQLEditorNested.java:279) at org.jkiss.dbeaver.model.exec.DBExecUtils.tryExecuteRecover(DBExecUtils.java:171) at org.jkiss.dbeaver.ui.editors.sql.SQLEditorNested$ObjectDocumentProvider$1.run(SQLEditorNested.java:277) at org.jkiss.dbeaver.model.runtime.AbstractJob.run(AbstractJob.java:105) at org.eclipse.core.internal.jobs.Worker.run(Worker.java:63) Session data: eclipse.buildId=unknown java.version=11.0.12 java.vendor=Eclipse Foundation BootLoader constants: OS=win32, ARCH=x86_64, WS=win32, NL=en Command-line arguments: -os win32 -ws win32 -arch x86_64 Connection test shows: Server: Microsoft SQL Server 12.00.214 Microsoft SQL Azure (RTM) - 12.0.2000.8 Mar 31 2022 08:13:33 Driver: Microsoft JDBC Driver 9.2 for SQL Server 9.2.0.0 Output of `SELECT SERVERPROPERTY('EngineEdition')`: 11 `SELECT definition FROM sys.sql_modules WHERE object_id = (OBJECT_ID(N'your_shema_name.your_view_name'))` (adapted to existing schemas and views, obviously) gives no results.

2e150880eb8c50b521fce85aacfad7c1bf9ea29f

4c27fb0b16d838cf7bd1eeafc2082bc7136f7ba5

https://github.com/dbeaver/dbeaver/compare/2e150880eb8c50b521fce85aacfad7c1bf9ea29f...4c27fb0b16d838cf7bd1eeafc2082bc7136f7ba5

diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerViewManager.java b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerViewManager.java index 0a6428e52c..10b8537007 100644 --- a/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerViewManager.java +++ b/plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerViewManager.java @@ -97,7 +97,8 @@ public class SQLServerViewManager extends SQLServerBaseTableManager<SQLServerVie { SQLServerDatabase procDatabase = view.getContainer().getDatabase(); SQLServerDatabase defaultDatabase = ((SQLServerExecutionContext)executionContext).getDefaultCatalog(); - if (defaultDatabase != procDatabase) { + boolean addUse = defaultDatabase != null && procDatabase != null && defaultDatabase != procDatabase; + if (addUse) { actions.add(new SQLDatabasePersistAction("Set current database", "USE " + DBUtils.getQuotedIdentifier(procDatabase), false)); //$NON-NLS-2$ } @@ -113,7 +114,7 @@ public class SQLServerViewManager extends SQLServerBaseTableManager<SQLServerVie break; } - if (defaultDatabase != procDatabase) { + if (addUse) { actions.add(new SQLDatabasePersistAction("Set current database ", "USE " + DBUtils.getQuotedIdentifier(defaultDatabase), false)); //$NON-NLS-2$ } }

['plugins/org.jkiss.dbeaver.ext.mssql/src/org/jkiss/dbeaver/ext/mssql/edit/SQLServerViewManager.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/18887/18885

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/18885

https://github.com/dbeaver/dbeaver/pull/18887

https://github.com/dbeaver/dbeaver/pull/18887

fix

Get prompted every time a variable is referenced in a SQL script

### Description I upgraded DBeaver Community Edition to version 22.3.3.202301211053 a few days ago. After this upgrade the behavior of the variables in DBeaver has changed., I use @set statements to setup values for the variable and was able to use them throughout my SQL scripts. The same scripts now kept prompting for the value of the variables. Looks like it does not use the values that I set in the script. Even after I entered the value in the "Bind parameters" dialog, it popped up each time the variable is used. I have been searching to see if there is setting that I can control but to no avail... thinking of downgrading to 22.3.2, Thanks ### DBeaver Version Community Edition 22.3.3 ### Operating System Windows ### Database and driver Snowflake ### Steps to reproduce @set v_WorkFlow = Clone_Operations_Schema @echo ${v_WorkFlow}, ${V_WORKFLOW} select '${v_WorkFlow}'; ### Additional context _No response_

a7f2fd65626498d2ea3f2e1a5ded926434ab5d11

884553d44a3ccfc07c86ee00ec0861564e760f88

https://github.com/dbeaver/dbeaver/compare/a7f2fd65626498d2ea3f2e1a5ded926434ab5d11...884553d44a3ccfc07c86ee00ec0861564e760f88

diff --git a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParser.java b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParser.java index 1dc5f278e1..b712d7f7cb 100644 --- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParser.java +++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParser.java @@ -781,7 +781,13 @@ public class SQLScriptParser { } if (param == null) { - param = new SQLQueryParameter(syntaxManager, orderPos, matcher.group(0), start, matcher.end() - matcher.start()); + param = new SQLQueryParameter( + syntaxManager, + orderPos, + matcher.group(SQLQueryParameter.VARIABLE_NAME_GROUP_NAME).toUpperCase(Locale.ENGLISH), + start, + matcher.end() - matcher.start() + ); if (parameters == null) { parameters = new ArrayList<>(); } diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQueryParameter.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQueryParameter.java index 5b12c7678b..dcab25dea1 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQueryParameter.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQueryParameter.java @@ -25,9 +25,10 @@ import java.util.regex.Pattern; */ public class SQLQueryParameter { + public static final String VARIABLE_NAME_GROUP_NAME = "pn"; - private static final Pattern VARIABLE_PATTERN_SIMPLE = Pattern.compile("\\\\$\\\\{[a-z0-9_]+\\\\}", Pattern.CASE_INSENSITIVE); - private static final Pattern VARIABLE_PATTERN_FULL = Pattern.compile("\\\\$P?!?\\\\{[a-z0-9_]+\\\\}", Pattern.CASE_INSENSITIVE); + private static final Pattern VARIABLE_PATTERN_SIMPLE = Pattern.compile("\\\\$\\\\{(?<pn>[a-z0-9_]+)\\\\}", Pattern.CASE_INSENSITIVE); + private static final Pattern VARIABLE_PATTERN_FULL = Pattern.compile("\\\\$P?!?\\\\{(?<pn>[a-z0-9_]+)\\\\}", Pattern.CASE_INSENSITIVE); private final SQLSyntaxManager syntaxManager; diff --git a/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParserGenericsTest.java b/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParserGenericsTest.java index 7008710ba3..202f194b73 100644 --- a/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParserGenericsTest.java +++ b/test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParserGenericsTest.java @@ -176,7 +176,7 @@ public class SQLScriptParserGenericsTest { } Assert.assertEquals(List.of("1", "SYs_B_1", "MyVar8", "ABC", "#d2"), actualParamNames); } - + @Test public void parseVariables() throws DBException { List<String> inputParamNames = List.of("aBc", "PrE#%&@T", "a@c="); @@ -191,6 +191,36 @@ public class SQLScriptParserGenericsTest { } Assert.assertEquals(List.of("ABC", "PRE#%&@T", "A@C="), actualParamNames); } + + @Test + public void parseVariablesInStrings() throws DBException { + List<String> inputParamNames = List.of("aBc", "PrET", "ac"); + StringJoiner joiner = new StringJoiner(", ", "select ", " from dual"); + inputParamNames.stream().forEach(p -> joiner.add("'${" + p + "}'")); + String query = joiner.toString(); + SQLParserContext context = createParserContext(setDialect("snowflake"), query); + List<SQLQueryParameter> params = SQLScriptParser.parseParametersAndVariables(context, 0, query.length()); + List<String> actualParamNames = new ArrayList<String>(); + for (SQLQueryParameter sqlQueryParameter : params) { + actualParamNames.add(sqlQueryParameter.getName()); + } + Assert.assertEquals(List.of("ABC", "PRET", "AC"), actualParamNames); + } + + @Test + public void parseVariablesInComment() throws DBException { + List<String> inputParamNames = List.of("aBc", "PrET", "ac"); + StringJoiner joiner = new StringJoiner(", ", "-- ", " "); + inputParamNames.stream().forEach(p -> joiner.add("${" + p + "}")); + String query = joiner.toString(); + SQLParserContext context = createParserContext(setDialect("snowflake"), query); + List<SQLQueryParameter> params = SQLScriptParser.parseParametersAndVariables(context, 0, query.length()); + List<String> actualParamNames = new ArrayList<String>(); + for (SQLQueryParameter sqlQueryParameter : params) { + actualParamNames.add(sqlQueryParameter.getName()); + } + Assert.assertEquals(List.of("ABC", "PRET", "AC"), actualParamNames); + } @Test public void parseParameterFromSetCommand() throws DBException {

['plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/SQLQueryParameter.java', 'test/org.jkiss.dbeaver.test.platform/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParserGenericsTest.java', 'plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/parser/SQLScriptParser.java']

{'.java': 3}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/20881/20529

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/20529

https://github.com/dbeaver/dbeaver/pull/20881

https://github.com/dbeaver/dbeaver/pull/20881

closes

SSH connection defaults to OS login, if server login not saved in settings

### Description It's related to credential popup changes from #18017 - now if SSH is set to use encrypted certificates there will be a popup asking for certificate password, but there's no way to enter server login. If the login is stored in settings - it will work - but in case the login is left empty, the connection will default to OS login. ### DBeaver Version Community Edition 23.1.2 ### Operating System Windows 10 ### Database and driver _No response_ ### Steps to reproduce 1. Configure SSH with jump server (probably without the jump server will be the same) 2. Use encrypted certificate as auth, leave passphrases blank 3. Leave the "user name" blank 4. Try to connect The connection will ask for passphrase, but not for login and then it will default to using OS user name as SSH server login. ### Additional context _No response_

1ad21c12ab285733bdf877024ebb4d6d071617b1

41addd796eaf82905bfb7d587214542b8990c50d

https://github.com/dbeaver/dbeaver/compare/1ad21c12ab285733bdf877024ebb4d6d071617b1...41addd796eaf82905bfb7d587214542b8990c50d

diff --git a/plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java b/plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java index ffd49fbb4f..7f59eee123 100644 --- a/plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java +++ b/plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java @@ -256,7 +256,7 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<Obje ? SSHUIMessages.model_ssh_dialog_credentials_passphrase : SSHUIMessages.model_ssh_dialog_credentials_password, password, - type.equals(SSHConstants.AuthType.PUBLIC_KEY), + false, false ); } catch (Exception e) { @@ -298,9 +298,7 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<Obje DBPAuthInfo dbpAuthInfo = promptCredentialsDialog(authType, configuration.getUserName(), configuration.getPassword()); if (dbpAuthInfo != null) { - if (authType.equals(SSHConstants.AuthType.PASSWORD)) { - configuration.setUserName(dbpAuthInfo.getUserName()); - } + configuration.setUserName(dbpAuthInfo.getUserName()); configuration.setPassword(dbpAuthInfo.getUserPassword()); } checkJumpServerConfiguration(tunnel); @@ -337,19 +335,18 @@ public class SSHTunnelConfiguratorUI implements IObjectPropertyConfigurator<Obje ); if (tunnel.getRequiredCredentials(configuration, getJumpServerSettingsPrefix()) != DBWTunnel.AuthCredentials.NONE) { - DBPAuthInfo dbpAuthInfo = promptCredentialsDialog(authType, - configuration.getStringProperty(getJumpServerSettingsPrefix() - + DBConstants.PROP_ID_NAME), - configuration.getSecureProperty(getJumpServerSettingsPrefix() - + DBConstants.PROP_FEATURE_PASSWORD) + DBPAuthInfo dbpAuthInfo = promptCredentialsDialog( + authType, + configuration.getStringProperty(getJumpServerSettingsPrefix() + DBConstants.PROP_ID_NAME), + configuration.getSecureProperty( + getJumpServerSettingsPrefix() + DBConstants.PROP_FEATURE_PASSWORD) ); if (dbpAuthInfo != null) { - if (authType.equals(SSHConstants.AuthType.PASSWORD)) { - configuration.setProperty(getJumpServerSettingsPrefix() + DBConstants.PROP_ID_NAME, - dbpAuthInfo.getUserName() - ); - } - configuration.setSecureProperty(getJumpServerSettingsPrefix() + DBConstants.PROP_FEATURE_PASSWORD, + configuration.setProperty(getJumpServerSettingsPrefix() + DBConstants.PROP_ID_NAME, + dbpAuthInfo.getUserName() + ); + configuration.setSecureProperty( + getJumpServerSettingsPrefix() + DBConstants.PROP_FEATURE_PASSWORD, dbpAuthInfo.getUserPassword() ); } diff --git a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java index 2aec12602b..0194debc58 100644 --- a/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java +++ b/plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java @@ -1928,9 +1928,7 @@ public class DataSourceDescriptor } if (networkHandler != null) { - if (authType == DBWTunnel.AuthCredentials.CREDENTIALS) { - networkHandler.setUserName(authInfo.getUserName()); - } + networkHandler.setUserName(authInfo.getUserName()); networkHandler.setPassword(authInfo.getUserPassword()); networkHandler.setSavePassword(authInfo.isSavePassword()); actualConfig.updateHandler(networkHandler); @@ -1989,7 +1987,7 @@ public class DataSourceDescriptor authType == DBWTunnel.AuthCredentials.PASSWORD ? RegistryMessages.dialog_connection_auth_passphrase : RegistryMessages.dialog_connection_auth_password, password, - authType != DBWTunnel.AuthCredentials.CREDENTIALS, + false, canSavePassword ); return authInfo;

['plugins/org.jkiss.dbeaver.registry/src/org/jkiss/dbeaver/registry/DataSourceDescriptor.java', 'plugins/org.jkiss.dbeaver.net.ssh.ui/src/org/jkiss/dbeaver/ui/net/ssh/SSHTunnelConfiguratorUI.java']

{'.java': 2}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

dbeaver/dbeaver/12799/12796

dbeaver

dbeaver

https://github.com/dbeaver/dbeaver/issues/12796

https://github.com/dbeaver/dbeaver/pull/12799

https://github.com/dbeaver/dbeaver/pull/12799

fix

NPE with find/replace window

#### System information: - Operating system (distribution) and version Windows 10 - DBeaver version 21.1.0 - Additional extensions: n/a #### Connection specification: - Database name and version Oracle 12 - Driver name ojdbc 19 - Do you use tunnels or proxies (SSH, SOCKS, etc)? n/a #### Describe the problem you're observing: Sometimes the find/replace dialog, if left open while navigating different objects, throws a NullPointerException. When this happens, pressing the close button is useless. Instead, clicking on the X button successfully closes the dialog. An NPE is thrown every time you switch tab or click close. #### Steps to reproduce, if exist: I am not able to reliably reproduce this issue. #### Include any warning/errors/backtraces from the logs Exception when clicking "Close" ``` java.lang.NullPointerException at org.jkiss.dbeaver.ui.controls.lightgrid.LightGrid.selectCells(LightGrid.java:4178) at org.jkiss.dbeaver.ui.controls.resultset.spreadsheet.SpreadsheetFindReplaceTarget.endSession(SpreadsheetFindReplaceTarget.java:172) at org.jkiss.dbeaver.ui.DynamicFindReplaceTarget.endSession(DynamicFindReplaceTarget.java:105) at org.eclipse.ui.texteditor.FindReplaceDialog.handleDialogClose(FindReplaceDialog.java:1080) at org.eclipse.ui.texteditor.FindReplaceDialog.close(FindReplaceDialog.java:1055) at org.eclipse.ui.texteditor.FindReplaceDialog.buttonPressed(FindReplaceDialog.java:837) at org.eclipse.jface.dialogs.Dialog.lambda$0(Dialog.java:619) at org.eclipse.swt.events.SelectionListener$1.widgetSelected(SelectionListener.java:84) at org.eclipse.swt.widgets.TypedListener.handleEvent(TypedListener.java:252) at org.eclipse.swt.widgets.EventTable.sendEvent(EventTable.java:89) at org.eclipse.swt.widgets.Display.sendEvent(Display.java:4209) at org.eclipse.swt.widgets.Widget.sendEvent(Widget.java:1043) ... ``` Exception when switching tabs (happens only after the first one was triggered ``` java.lang.NullPointerException at org.jkiss.dbeaver.ui.controls.lightgrid.LightGrid.selectCells(LightGrid.java:4178) at org.jkiss.dbeaver.ui.controls.resultset.spreadsheet.SpreadsheetFindReplaceTarget.endSession(SpreadsheetFindReplaceTarget.java:172) at org.jkiss.dbeaver.ui.DynamicFindReplaceTarget.endSession(DynamicFindReplaceTarget.java:105) at org.eclipse.ui.texteditor.FindReplaceDialog.updateTarget(FindReplaceDialog.java:1719) at org.eclipse.ui.texteditor.FindReplaceAction$FindReplaceDialogStub.partActivated(FindReplaceAction.java:130) at org.eclipse.ui.texteditor.FindReplaceAction$FindReplaceDialogStub.partActivated(FindReplaceAction.java:137) at org.eclipse.ui.internal.PartService$6.run(PartService.java:145) at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45) at org.eclipse.ui.internal.PartService.partActivated(PartService.java:142) at org.eclipse.ui.internal.WorkbenchPage$4.run(WorkbenchPage.java:4901) at org.eclipse.core.runtime.SafeRunner.run(SafeRunner.java:45) at org.eclipse.ui.internal.WorkbenchPage.firePartActivated(WorkbenchPage.java:4898) at org.eclipse.ui.internal.WorkbenchPage$E4PartListener.partActivated(WorkbenchPage.java:219) at org.eclipse.e4.ui.internal.workbench.PartServiceImpl$2.run(PartServiceImpl.java:249) ... ```

ad8a5859e3a946a7cd65f00ddb0e8c6a8e13276d

6ebeeb857461cf8963797e57c101b29eba863a57

https://github.com/dbeaver/dbeaver/compare/ad8a5859e3a946a7cd65f00ddb0e8c6a8e13276d...6ebeeb857461cf8963797e57c101b29eba863a57

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetFindReplaceTarget.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetFindReplaceTarget.java index cb8862fc78..7f4a301895 100644 --- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetFindReplaceTarget.java +++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetFindReplaceTarget.java @@ -61,7 +61,7 @@ class SpreadsheetFindReplaceTarget implements IFindReplaceTarget, IFindReplaceTa private Color scopeHighlightColor; private boolean replaceAll; private boolean sessionActive = false; - private List<GridPos> originalSelection = null; + private List<GridPos> originalSelection = new ArrayList<>(); public static synchronized SpreadsheetFindReplaceTarget getInstance() { if (instance == null) {

['plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetFindReplaceTarget.java']

{'.java': 1}

Java

{'Java': 26145871, 'JavaScript': 139972, 'C++': 63113, 'ANTLR': 29768, 'CSS': 20674, 'HTML': 12246, 'XSLT': 8047, 'Batchfile': 2891, 'Shell': 202}

Apache License 2.0

alibaba/easyexcel/1923/1651

alibaba

easyexcel

https://github.com/alibaba/easyexcel/issues/1651

https://github.com/alibaba/easyexcel/pull/1923

https://github.com/alibaba/easyexcel/pull/1923

fix

使用模板填充导出的时候设置自动换行报错

**触发场景描述** 模板填充导出的时候设置自动换行报错 **触发Bug的代码** ```java InputStream resourceAsStream = this.getClass().getClassLoader().getResourceAsStream("template/annualPlanning.xlsx"); //内容策略 WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); //设置 自动换行 contentWriteCellStyle.setWrapped(true); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(null, contentWriteCellStyle); ExcelWriter excelWriter = EasyExcel.write(outputStream) .withTemplate(resourceAsStream) .registerWriteHandler(new CustomCellWriteHandler()) .registerWriteHandler(horizontalCellStyleStrategy) .build(); WriteSheet writeSheet = EasyExcel.writerSheet().build(); FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); List<AnnualPlanningExcel> excelList; for (AnnualPlanningExcel planningExcel : annualPlanningExcelList) { excelList = new ArrayList<>(); excelList.add(planningExcel); excelWriter.fill(excelList, fillConfig, writeSheet); number++; } Map<String, Object> map = new HashMap<>(); map.put("name", tbAuditPlan.getPlanName()); excelWriter.fill(map, writeSheet); excelWriter.finish(); outputStream.flush(); outputStream.close(); ``` **java.lang.NullPointerException at com.alibaba.excel.write.style.HorizontalCellStyleStrategy.setContentCellStyle(HorizontalCellStyleStrategy.java:66) at com.alibaba.excel.write.style.AbstractCellStyleStrategy.afterCellDispose(AbstractCellStyleStrategy.java:60) at com.alibaba.excel.util.WriteHandlerUtils.afterCellDispose(WriteHandlerUtils.java:176) at com.alibaba.excel.util.WriteHandlerUtils.afterCellDispose(WriteHandlerUtils.java:164) at com.alibaba.excel.write.executor.ExcelWriteFillExecutor.doFill(ExcelWriteFillExecutor.java:201) at com.alibaba.excel.write.executor.ExcelWriteFillExecutor.fill(ExcelWriteFillExecutor.java:121) at com.alibaba.excel.write.ExcelBuilderImpl.fill(ExcelBuilderImpl.java:78) at com.alibaba.excel.ExcelWriter.fill(ExcelWriter.java:185) at com.alibaba.excel.ExcelWriter.fill(ExcelWriter.java:173) at org.dvt.modules.tb.service.impl.AnnualPlanningServiceImpl.download(AnnualPlanningServiceImpl.java:290) at org.dvt.modules.tb.controller.AnnualPlanningController.download(AnnualPlanningController.java:176) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:498) at org.springframework.web.method.support.InvocableHandlerMethod.doInvoke(InvocableHandlerMethod.java:190) at org.springframework.web.method.support.InvocableHandlerMethod.invokeForRequest(InvocableHandlerMethod.java:138) at org.springframework.web.servlet.mvc.method.annotation.ServletInvocableHandlerMethod.invokeAndHandle(ServletInvocableHandlerMethod.java:106) at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.invokeHandlerMethod(RequestMappingHandlerAdapter.java:879) at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter.handleInternal(RequestMappingHandlerAdapter.java:793) at org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter.handle(AbstractHandlerMethodAdapter.java:87) at org.springframework.web.servlet.DispatcherServlet.doDispatch(DispatcherServlet.java:1040) at org.springframework.web.servlet.DispatcherServlet.doService(DispatcherServlet.java:943) at org.springframework.web.servlet.FrameworkServlet.processRequest(FrameworkServlet.java:1006) at org.springframework.web.servlet.FrameworkServlet.doGet(FrameworkServlet.java:898) at javax.servlet.http.HttpServlet.service(HttpServlet.java:645) at org.springframework.web.servlet.FrameworkServlet.service(FrameworkServlet.java:883) at javax.servlet.http.HttpServlet.service(HttpServlet.java:750) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.shiro.web.servlet.AbstractShiroFilter.executeChain(AbstractShiroFilter.java:449) at org.apache.shiro.web.servlet.AbstractShiroFilter$1.call(AbstractShiroFilter.java:365) at org.apache.shiro.subject.support.SubjectCallable.doCall(SubjectCallable.java:90) at org.apache.shiro.subject.support.SubjectCallable.call(SubjectCallable.java:83) at org.apache.shiro.subject.support.DelegatingSubject.execute(DelegatingSubject.java:383) at org.apache.shiro.web.servlet.AbstractShiroFilter.doFilterInternal(AbstractShiroFilter.java:362) at org.apache.shiro.web.servlet.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:125) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.CorsFilter.doFilterInternal(CorsFilter.java:92) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:320) at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.invoke(FilterSecurityInterceptor.java:126) at org.springframework.security.web.access.intercept.FilterSecurityInterceptor.doFilter(FilterSecurityInterceptor.java:90) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.access.ExceptionTranslationFilter.doFilter(ExceptionTranslationFilter.java:118) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.session.SessionManagementFilter.doFilter(SessionManagementFilter.java:137) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.authentication.AnonymousAuthenticationFilter.doFilter(AnonymousAuthenticationFilter.java:111) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter.doFilter(SecurityContextHolderAwareRequestFilter.java:158) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.savedrequest.RequestCacheAwareFilter.doFilter(RequestCacheAwareFilter.java:63) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.authentication.logout.LogoutFilter.doFilter(LogoutFilter.java:116) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.header.HeaderWriterFilter.doHeadersAfter(HeaderWriterFilter.java:92) at org.springframework.security.web.header.HeaderWriterFilter.doFilterInternal(HeaderWriterFilter.java:77) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.context.SecurityContextPersistenceFilter.doFilter(SecurityContextPersistenceFilter.java:105) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter.doFilterInternal(WebAsyncManagerIntegrationFilter.java:56) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.springframework.security.web.FilterChainProxy$VirtualFilterChain.doFilter(FilterChainProxy.java:334) at org.springframework.security.web.FilterChainProxy.doFilterInternal(FilterChainProxy.java:215) at org.springframework.security.web.FilterChainProxy.doFilter(FilterChainProxy.java:178) at org.springframework.web.filter.DelegatingFilterProxy.invokeDelegate(DelegatingFilterProxy.java:358) at org.springframework.web.filter.DelegatingFilterProxy.doFilter(DelegatingFilterProxy.java:271) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.RequestContextFilter.doFilterInternal(RequestContextFilter.java:100) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.FormContentFilter.doFilterInternal(FormContentFilter.java:93) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.springframework.web.filter.CharacterEncodingFilter.doFilterInternal(CharacterEncodingFilter.java:201) at org.springframework.web.filter.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:119) at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193) at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:96) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:541) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:139) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:367) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(NioEndpoint.java:1639) at org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.lang.Thread.run(Thread.java:748)**

5a8d3f5bd452a4a6aa4f5156acd3c70c4620450a

fee773f04b3180621530494fad8590babf2040e7

https://github.com/alibaba/easyexcel/compare/5a8d3f5bd452a4a6aa4f5156acd3c70c4620450a...fee773f04b3180621530494fad8590babf2040e7

diff --git a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java index 295cd556..504570fa 100644 --- a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java @@ -60,9 +60,10 @@ public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { @Override protected void setContentCellStyle(Cell cell, Head head, Integer relativeRowIndex) { - if (contentCellStyleList == null || contentCellStyleList.isEmpty()) { + if (contentCellStyleList == null || contentCellStyleList.isEmpty() || relativeRowIndex == null) { return; } + cell.setCellStyle(contentCellStyleList.get(relativeRowIndex % contentCellStyleList.size())); }

['src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java']

{'.java': 1}

Java

{'Java': 1416062}

Apache License 2.0

square/leakcanary/475/417

square

leakcanary

https://github.com/square/leakcanary/issues/417

https://github.com/square/leakcanary/pull/475

https://github.com/square/leakcanary/pull/475

fixes

java.lang.NullPointerException alyunOS

In com.sumxiang.noteapp:1.0:2. - FAILURE: java.lang.NullPointerException: java.lang.NullPointerException at com.squareup.leakcanary.HahaHelper.classInstanceValues(HahaHelper.java:143) at com.squareup.leakcanary.HahaHelper.asString(HahaHelper.java:73) at com.squareup.leakcanary.HahaHelper.threadName(HahaHelper.java:55) at com.squareup.leakcanary.ShortestPathFinder.enqueueGcRoots(ShortestPathFinder.java:133) at com.squareup.leakcanary.ShortestPathFinder.findPath(ShortestPathFinder.java:82) at com.squareup.leakcanary.HeapAnalyzer.findLeakTrace(HeapAnalyzer.java:112) at com.squareup.leakcanary.HeapAnalyzer.checkForLeak(HeapAnalyzer.java:87) at com.squareup.leakcanary.internal.HeapAnalyzerService.onHandleIntent(HeapAnalyzerService.java:58) at android.app.IntentService$ServiceHandler.handleMessage(IntentService.java:65) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loop(Looper.java:136) at android.os.HandlerThread.run(HandlerThread.java:61) - Reference Key: 17ea16ba-cb43-4a23-bd9e-18c6ad09b2d2 - Device: Xiaomi Xiaomi HM 1SW armani - Android Version: 4.4.4 API: 19 LeakCanary: 1.4-beta1 02804f3 - Durations: watch=5018ms, gc=123ms, heap dump=580ms, analysis=4082ms - Excluded Refs: | Field: android.app.ActivityThread$ActivityClientRecord.nextIdle | Field: android.widget.Editor$EasyEditSpanController.this$0 | Field: android.widget.Editor$SpanController.this$0 | Field: android.os.Message.obj | Field: android.os.Message.next | Field: android.os.Message.target | Field: android.view.inputmethod.InputMethodManager.mNextServedView | Field: android.view.inputmethod.InputMethodManager.mServedView | Field: android.view.inputmethod.InputMethodManager.mServedInputConnection | Field: android.view.inputmethod.InputMethodManager.mCurRootView | Field: android.animation.LayoutTransition$1.val$parent | Field: android.view.textservice.SpellCheckerSession$1.this$0 | Field: android.support.v7.internal.widget.ActivityChooserModel.mActivityChoserModelPolicy | Field: android.widget.ActivityChooserModel.mActivityChoserModelPolicy | Field: android.speech.SpeechRecognizer$InternalListener.this$0 | Field: android.accounts.AccountManager$AmsTask$Response.this$1 | Field: android.media.MediaScannerConnection.mContext | Field: android.os.UserManager.mContext | Field: android.appwidget.AppWidgetHost$Callbacks.this$0 | Field: android.media.AudioManager$1.this$0 | Field: android.view.Choreographer$FrameDisplayEventReceiver.mMessageQueue (always) | Static field: android.text.TextLine.sCached | Thread:FinalizerWatchdogDaemon (always) | Thread:main (always) | Thread:LeakCanary-Heap-Dump (always) | Class:java.lang.ref.WeakReference (always) | Class:java.lang.ref.SoftReference (always) | Class:java.lang.ref.PhantomReference (always) | Class:java.lang.ref.Finalizer (always) | Class:java.lang.ref.FinalizerReference (always) | Root Class:android.os.Binder (always) dump http://pan.baidu.com/s/1c0KU7y4

9e74a8529ca94287fe0c3b02b7a6b39d51ecd704

3df74c4eb81f13053dd961d534ec152f467df6c4

https://github.com/square/leakcanary/compare/9e74a8529ca94287fe0c3b02b7a6b39d51ecd704...3df74c4eb81f13053dd961d534ec152f467df6c4

diff --git a/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HahaHelper.java b/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HahaHelper.java index fbbf8ba08..fe01cd23b 100644 --- a/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HahaHelper.java +++ b/leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HahaHelper.java @@ -52,6 +52,11 @@ public final class HahaHelper { static String threadName(Instance holder) { List<ClassInstance.FieldValue> values = classInstanceValues(holder); Object nameField = fieldValue(values, "name"); + if (nameField == null) { + // Sometimes we can't find the String at the expected memory address in the heap dump. + // See https://github.com/square/leakcanary/issues/417 . + return "Thread name not available"; + } return asString(nameField); }

['leakcanary-analyzer/src/main/java/com/squareup/leakcanary/HahaHelper.java']

{'.java': 1}

Kotlin

{'Kotlin': 1363625, 'Java': 4762, 'Shell': 481, 'AIDL': 203}

Apache License 2.0

square/leakcanary/458/449

square

leakcanary

https://github.com/square/leakcanary/issues/449

https://github.com/square/leakcanary/pull/458

https://github.com/square/leakcanary/pull/458

fixes

NullPointerException in LeakCanaryInternals.isInServiceProcess()

It looks like ActivityManager.getRunningAppProcesses can return null: http://developer.android.com/reference/android/app/ActivityManager.html#getRunningAppProcesses() LeakCanaryInternals.isInServiceProcess() doesn't seem to check for this case. Stack trace excerpt: java.lang.RuntimeException: Unable to create application [...]: java.lang.NullPointerException: Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference at android.app.ActivityThread.handleBindApplication(ActivityThread.java:4710) at android.app.ActivityThread.-wrap1(ActivityThread.java) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1405) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loop(Looper.java:148) at android.app.ActivityThread.main(ActivityThread.java:5417) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:726) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:616) Caused by: java.lang.NullPointerException: Attempt to invoke interface method 'java.util.Iterator java.util.List.iterator()' on a null object reference at com.squareup.leakcanary.internal.LeakCanaryInternals.isInServiceProcess(LeakCanaryInternals.java:117) at com.squareup.leakcanary.LeakCanary.isInAnalyzerProcess(LeakCanary.java:237) at com.squareup.leakcanary.LeakCanary.install(LeakCanary.java:77) at com.squareup.leakcanary.LeakCanary.install(LeakCanary.java:42) [...]

462561d249bddf5a28439bc588a7cb026a8425bf

efa41ac38b4fa4d48df06d011730a7ffdc8eb0d0

https://github.com/square/leakcanary/compare/462561d249bddf5a28439bc588a7cb026a8425bf...efa41ac38b4fa4d48df06d011730a7ffdc8eb0d0

diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java index b334079f4..973b1b84d 100644 --- a/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java +++ b/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java @@ -29,6 +29,7 @@ import android.content.pm.ServiceInfo; import com.squareup.leakcanary.CanaryLog; import com.squareup.leakcanary.R; import java.lang.reflect.Method; +import java.util.List; import java.util.concurrent.Executor; import java.util.concurrent.Executors; @@ -114,10 +115,14 @@ public final class LeakCanaryInternals { ActivityManager activityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE); ActivityManager.RunningAppProcessInfo myProcess = null; - for (ActivityManager.RunningAppProcessInfo process : activityManager.getRunningAppProcesses()) { - if (process.pid == myPid) { - myProcess = process; - break; + List<ActivityManager.RunningAppProcessInfo> runningProcesses = + activityManager.getRunningAppProcesses(); + if (runningProcesses != null) { + for (ActivityManager.RunningAppProcessInfo process : runningProcesses) { + if (process.pid == myPid) { + myProcess = process; + break; + } } } if (myProcess == null) {

['leakcanary-android/src/main/java/com/squareup/leakcanary/internal/LeakCanaryInternals.java']

{'.java': 1}

Kotlin

{'Kotlin': 1363625, 'Java': 4762, 'Shell': 481, 'AIDL': 203}

Apache License 2.0

square/leakcanary/405/382

square

leakcanary

https://github.com/square/leakcanary/issues/382

https://github.com/square/leakcanary/pull/405

https://github.com/square/leakcanary/pull/405

fixes

Crash opening "Leaks" activity on 1.4-beta1

My test device is running Android M, and I have not had a leak to get the notification to grant storage permissions. When I run the Leaks activity, it crashes with the dump below. The activity is able to open after granting storage permission. ``` D Shutting down VM E FATAL EXCEPTION: main E Process: com.meiste.tempalarm, PID: 14231 E java.lang.RuntimeException: Unable to resume activity {com.meiste.tempalarm/com.squareup.leakcanary.internal.DisplayLeakActivity}: java.lang.Unsupport edOperationException: Could not create leak directory /storage/emulated/0/Download/leakcanary-com.meiste.tempalarm E at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3121) E at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3152) E at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2495) E at android.app.ActivityThread.-wrap11(ActivityThread.java) E at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1354) E at android.os.Handler.dispatchMessage(Handler.java:102) E at android.os.Looper.loop(Looper.java:148) E at android.app.ActivityThread.main(ActivityThread.java:5443) E at java.lang.reflect.Method.invoke(Native Method) E at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:728) E at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:618) E Caused by: java.lang.UnsupportedOperationException: Could not create leak directory /storage/emulated/0/Download/leakcanary-com.meiste.tempalarm E at com.squareup.leakcanary.DefaultLeakDirectoryProvider.leakDirectory(DefaultLeakDirectoryProvider.java:45) E at com.squareup.leakcanary.internal.DisplayLeakActivity.getLeakDirectory(DisplayLeakActivity.java:94) E at com.squareup.leakcanary.internal.DisplayLeakActivity$LoadLeaks.<init>(DisplayLeakActivity.java:431) E at com.squareup.leakcanary.internal.DisplayLeakActivity$LoadLeaks.load(DisplayLeakActivity.java:413) E at com.squareup.leakcanary.internal.DisplayLeakActivity.onResume(DisplayLeakActivity.java:142) E at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1281) E at android.app.Activity.performResume(Activity.java:6320) E at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3110) E ... 10 more ```

37cb2b7f3cb05bb0ac916d1cb308f9ba2c177472

131a8ae309b8f422d54685875ee0568da50ef2dc

https://github.com/square/leakcanary/compare/37cb2b7f3cb05bb0ac916d1cb308f9ba2c177472...131a8ae309b8f422d54685875ee0568da50ef2dc

diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/AndroidHeapDumper.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/AndroidHeapDumper.java index 86a232f0a..c46435f35 100644 --- a/leakcanary-android/src/main/java/com/squareup/leakcanary/AndroidHeapDumper.java +++ b/leakcanary-android/src/main/java/com/squareup/leakcanary/AndroidHeapDumper.java @@ -47,7 +47,7 @@ public final class AndroidHeapDumper implements HeapDumper { @Override public File dumpHeap() { if (!leakDirectoryProvider.isLeakStorageWritable()) { CanaryLog.d("Could not write to leak storage to dump heap."); - leakDirectoryProvider.requestWritePermission(); + leakDirectoryProvider.requestWritePermissionNotification(); return NO_DUMP; } File heapDumpFile = getHeapDumpFile(); diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/DefaultLeakDirectoryProvider.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/DefaultLeakDirectoryProvider.java index 988906e31..812b6e647 100644 --- a/leakcanary-android/src/main/java/com/squareup/leakcanary/DefaultLeakDirectoryProvider.java +++ b/leakcanary-android/src/main/java/com/squareup/leakcanary/DefaultLeakDirectoryProvider.java @@ -16,6 +16,7 @@ package com.squareup.leakcanary; import android.annotation.TargetApi; +import android.app.Activity; import android.app.PendingIntent; import android.content.Context; import android.os.Environment; @@ -48,7 +49,7 @@ public final class DefaultLeakDirectoryProvider implements LeakDirectoryProvider return directory; } - @Override public void requestWritePermission() { + @Override public void requestWritePermissionNotification() { if (hasStoragePermission()) { return; } @@ -60,6 +61,16 @@ public final class DefaultLeakDirectoryProvider implements LeakDirectoryProvider showNotification(context, contentTitle, contentText, pendingIntent); } + @TargetApi(M) @Override public void requestPermission(Activity activity) { + if (hasStoragePermission()) { + return; + } + String[] permissions = { + WRITE_EXTERNAL_STORAGE + }; + activity.requestPermissions(permissions, 42); + } + @Override public boolean isLeakStorageWritable() { if (!hasStoragePermission()) { return false; diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakDirectoryProvider.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakDirectoryProvider.java index 6c8cf0568..1e7ebf87b 100644 --- a/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakDirectoryProvider.java +++ b/leakcanary-android/src/main/java/com/squareup/leakcanary/LeakDirectoryProvider.java @@ -15,6 +15,7 @@ */ package com.squareup.leakcanary; +import android.app.Activity; import java.io.File; /** @@ -27,7 +28,9 @@ public interface LeakDirectoryProvider { /** Returns a path to an existing directory were leaks can be stored. */ File leakDirectory(); - void requestWritePermission(); + void requestWritePermissionNotification(); + + void requestPermission(Activity activity); /** True if we can currently write to the leak directory. */ boolean isLeakStorageWritable(); diff --git a/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java b/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java index 2be0290d3..e746b04c5 100644 --- a/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java +++ b/leakcanary-android/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java @@ -88,13 +88,12 @@ public final class DisplayLeakActivity extends Activity { DisplayLeakActivity.leakDirectoryProvider = leakDirectoryProvider; } - static File getLeakDirectory(Context context) { + private static LeakDirectoryProvider leakDirectoryProvider(Context context) { LeakDirectoryProvider leakDirectoryProvider = DisplayLeakActivity.leakDirectoryProvider; - if (leakDirectoryProvider != null) { - return leakDirectoryProvider.leakDirectory(); - } else { - return new DefaultLeakDirectoryProvider(context).leakDirectory(); + if (leakDirectoryProvider == null) { + leakDirectoryProvider = new DefaultLeakDirectoryProvider(context); } + return leakDirectoryProvider; } // null until it's been first loaded. @@ -141,7 +140,13 @@ public final class DisplayLeakActivity extends Activity { @Override protected void onResume() { super.onResume(); - LoadLeaks.load(this); + LeakDirectoryProvider leakDirectoryProvider = leakDirectoryProvider(this); + if (leakDirectoryProvider.isLeakStorageWritable()) { + File leakDirectory = leakDirectoryProvider.leakDirectory(); + LoadLeaks.load(this, leakDirectory); + } else { + leakDirectoryProvider.requestPermission(this); + } } @Override public void setTheme(int resid) { @@ -237,7 +242,7 @@ public final class DisplayLeakActivity extends Activity { } void deleteAllLeaks() { - File leakDirectory = getLeakDirectory(DisplayLeakActivity.this); + File leakDirectory = leakDirectoryProvider(DisplayLeakActivity.this).leakDirectory(); File[] files = leakDirectory.listFiles(); if (files != null) { for (File file : files) { @@ -428,8 +433,8 @@ public final class DisplayLeakActivity extends Activity { static final Executor backgroundExecutor = newSingleThreadExecutor("LoadLeaks"); - static void load(DisplayLeakActivity activity) { - LoadLeaks loadLeaks = new LoadLeaks(activity); + static void load(DisplayLeakActivity activity, File leakDirectory) { + LoadLeaks loadLeaks = new LoadLeaks(activity, leakDirectory); inFlight.add(loadLeaks); backgroundExecutor.execute(loadLeaks); } @@ -445,9 +450,9 @@ public final class DisplayLeakActivity extends Activity { private final File leakDirectory; private final Handler mainHandler; - LoadLeaks(DisplayLeakActivity activity) { + LoadLeaks(DisplayLeakActivity activity, File leakDirectory) { this.activityOrNull = activity; - leakDirectory = getLeakDirectory(activity); + this.leakDirectory = leakDirectory; mainHandler = new Handler(Looper.getMainLooper()); }

['leakcanary-android/src/main/java/com/squareup/leakcanary/internal/DisplayLeakActivity.java', 'leakcanary-android/src/main/java/com/squareup/leakcanary/AndroidHeapDumper.java', 'leakcanary-android/src/main/java/com/squareup/leakcanary/DefaultLeakDirectoryProvider.java', 'leakcanary-android/src/main/java/com/squareup/leakcanary/LeakDirectoryProvider.java']

{'.java': 4}

Kotlin

{'Kotlin': 1363625, 'Java': 4762, 'Shell': 481, 'AIDL': 203}

Apache License 2.0

alibaba/nacos/3816/3787

alibaba

nacos

https://github.com/alibaba/nacos/issues/3787

https://github.com/alibaba/nacos/pull/3816

https://github.com/alibaba/nacos/pull/3816

fixes

client error: invalid param. For input string: "${nacos.config.maxRetry${nacos.maxRetry:}}"

<!-- Here is for bug reports and feature requests ONLY! If you're looking for help, please check our mail list、WeChat group and the Gitter room. Please try to use English to describe your issue, or at least provide a snippet of English translation. 我们鼓励使用英文，如果不能直接使用，可以使用翻译软件，您仍旧可以保留中文原文。 --> **Describe the bug** 在1.3.1和1.3.2的版本中，若没有明确指定 nacos.config.max-retry 的值，启动springboot程序，将会报如标题所示错误。 **Expected behavior** 预期程序正常启动，该值采用默认值3 **Acutally behavior** 实际上会报如标题所示错误。 **How to Reproduce** Steps to reproduce the behavior: 调试发现，在1.3.0版本中，采用的是org.apache.commons.lang3.math.NumberUtils.toInt(String str, int defaultValue)方法。 而报错的版本采用的是com.alibaba.nacos.common.utils.ConvertUtils.toInt(String val, int defaultValue)方法。 理论上报错版本的方法也没问题，但是不知道为什么在默认情况下传进来的val的值是${nacos.config.maxRetry${nacos.maxRetry:}}，导致程序出错。 **Desktop (please complete the following information):** - OS: [e.g. Centos] - Version [e.g. nacos-server 1.3.2, nacos-client 1.3.2] - Module [e.g. naming/config] - SDK [e.g. original, spring-cloud-alibaba-nacos, dubbo] **Additional context** Add any other context about the problem here.

a41d209d570ccf5deed6c6c608861b1638ded2f5

af2151e49c359b3fc7c9dd27ac9adbfb71d1ccec

https://github.com/alibaba/nacos/compare/a41d209d570ccf5deed6c6c608861b1638ded2f5...af2151e49c359b3fc7c9dd27ac9adbfb71d1ccec

diff --git a/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java b/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java index 628d79bc3..50670e411 100644 --- a/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java +++ b/common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java @@ -51,7 +51,11 @@ public final class ConvertUtils { if (StringUtils.isBlank(val)) { return defaultValue; } - return Integer.parseInt(val); + try { + return Integer.parseInt(val); + } catch (NumberFormatException exception) { + return defaultValue; + } } /** @@ -77,7 +81,11 @@ public final class ConvertUtils { if (StringUtils.isBlank(val)) { return defaultValue; } - return Long.parseLong(val); + try { + return Long.parseLong(val); + } catch (NumberFormatException exception) { + return defaultValue; + } } /** @@ -92,7 +100,11 @@ public final class ConvertUtils { if (StringUtils.isBlank(val)) { return defaultValue; } - return Boolean.parseBoolean(val); + try { + return Boolean.parseBoolean(val); + } catch (NumberFormatException exception) { + return defaultValue; + } } // The following utility functions are extracted from <link>org.apache.commons.lang3</link>

['common/src/main/java/com/alibaba/nacos/common/utils/ConvertUtils.java']

{'.java': 1}

Java

{'Java': 10177611, 'SCSS': 80453, 'JavaScript': 7472, 'Shell': 6561, 'TypeScript': 4774, 'Batchfile': 4434, 'EJS': 2645}

Apache License 2.0

alibaba/spring-cloud-alibaba/20/19

alibaba

spring-cloud-alibaba

https://github.com/alibaba/spring-cloud-alibaba/issues/19

https://github.com/alibaba/spring-cloud-alibaba/pull/20

https://github.com/alibaba/spring-cloud-alibaba/pull/20

fixes

Get wrong instance list at first time

How to reproduce this issue, refer to followings: I have registered 2 instances (ex service name are all 'a') to nacos server Then I stop them After a while, I do step 1 again Then I get 2 instances from interface, for first time, it returns 1 instance or 0 instance. But I invoke again, it is fine to return 2 instances. Guess the cache issue?

625e85b0401f5837b48697667ea10e62fe7e3855

1b733af0d515895f1d122bb0f67a6ab9c5d63121

https://github.com/alibaba/spring-cloud-alibaba/compare/625e85b0401f5837b48697667ea10e62fe7e3855...1b733af0d515895f1d122bb0f67a6ab9c5d63121

diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java index f766945f..0d4fdbb8 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java @@ -44,8 +44,17 @@ public class NacosServerList extends AbstractServerList<NacosServer> { @Override public List<NacosServer> getInitialListOfServers() { + return getServers(); + } + + @Override + public List<NacosServer> getUpdatedListOfServers() { + return getServers(); + } + + private List<NacosServer> getServers() { try { - List<Instance> instances = registration.getNacosNamingService().selectInstances(serviceId,true); + List<Instance> instances = registration.getNacosNamingService().selectInstances(serviceId, true); return instancesToServerList(instances); } catch (Exception e) { @@ -53,11 +62,6 @@ public class NacosServerList extends AbstractServerList<NacosServer> { } } - @Override - public List<NacosServer> getUpdatedListOfServers() { - return getInitialListOfServers(); - } - private List<NacosServer> instancesToServerList(List<Instance> instances) { List<NacosServer> result = new ArrayList<>(instances.size()); for (Instance instance : instances) {

['spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java']

{'.java': 1}

Java

{'Java': 1218311, 'HTML': 9491, 'Shell': 2729, 'Dockerfile': 1686, 'JavaScript': 860}

Apache License 2.0

alibaba/spring-cloud-alibaba/21/19

alibaba

spring-cloud-alibaba

https://github.com/alibaba/spring-cloud-alibaba/issues/19

https://github.com/alibaba/spring-cloud-alibaba/pull/21

https://github.com/alibaba/spring-cloud-alibaba/pull/21

fixes

Get wrong instance list at first time

How to reproduce this issue, refer to followings: I have registered 2 instances (ex service name are all 'a') to nacos server Then I stop them After a while, I do step 1 again Then I get 2 instances from interface, for first time, it returns 1 instance or 0 instance. But I invoke again, it is fine to return 2 instances. Guess the cache issue?

8e89f6d15a89da422336b9a37d3c65985e6c15bc

541eaee0b8492f96fd488d862de10b65aa608a8c

https://github.com/alibaba/spring-cloud-alibaba/compare/8e89f6d15a89da422336b9a37d3c65985e6c15bc...541eaee0b8492f96fd488d862de10b65aa608a8c

diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java index f766945f..0d4fdbb8 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java @@ -44,8 +44,17 @@ public class NacosServerList extends AbstractServerList<NacosServer> { @Override public List<NacosServer> getInitialListOfServers() { + return getServers(); + } + + @Override + public List<NacosServer> getUpdatedListOfServers() { + return getServers(); + } + + private List<NacosServer> getServers() { try { - List<Instance> instances = registration.getNacosNamingService().selectInstances(serviceId,true); + List<Instance> instances = registration.getNacosNamingService().selectInstances(serviceId, true); return instancesToServerList(instances); } catch (Exception e) { @@ -53,11 +62,6 @@ public class NacosServerList extends AbstractServerList<NacosServer> { } } - @Override - public List<NacosServer> getUpdatedListOfServers() { - return getInitialListOfServers(); - } - private List<NacosServer> instancesToServerList(List<Instance> instances) { List<NacosServer> result = new ArrayList<>(instances.size()); for (Instance instance : instances) {

['spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java']

{'.java': 1}

Java

{'Java': 1218311, 'HTML': 9491, 'Shell': 2729, 'Dockerfile': 1686, 'JavaScript': 860}

Apache License 2.0

alibaba/spring-cloud-alibaba/46/42

alibaba

spring-cloud-alibaba

https://github.com/alibaba/spring-cloud-alibaba/issues/42

https://github.com/alibaba/spring-cloud-alibaba/pull/46

https://github.com/alibaba/spring-cloud-alibaba/pull/46

fixes

Setting false on autoRegister of @EnableDiscoveryClient will throw exception and application failed to start

Description: Field nacosRegistration in org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient required a bean of type 'org.springframework.cloud.alibaba.nacos.registry.NacosRegistration' that could not be found. - Bean method 'nacosRegistration' not loaded because @ConditionalOnProperty (spring.cloud.service-registry.auto-registration.enabled) found different value in property 'spring.cloud.service-registry.auto-registration.enabled'

0f444a40abbe830b108478e9e18f9a74d845f862

27ddaa68a81214832a0351db439eabbef9aed7ec

https://github.com/alibaba/spring-cloud-alibaba/compare/0f444a40abbe830b108478e9e18f9a74d845f862...27ddaa68a81214832a0351db439eabbef9aed7ec

diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java index 78c7ddcc..6e087422 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java @@ -16,7 +16,6 @@ package org.springframework.cloud.alibaba.nacos; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -48,12 +47,6 @@ public class NacosDiscoveryAutoConfiguration { return new NacosServiceRegistry(); } - @Bean - @ConditionalOnMissingBean - public NacosDiscoveryProperties nacosProperties() { - return new NacosDiscoveryProperties(); - } - @Bean @ConditionalOnBean(AutoServiceRegistrationProperties.class) public NacosRegistration nacosRegistration() { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java index f9acd947..bab4b1a2 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java @@ -19,13 +19,15 @@ package org.springframework.cloud.alibaba.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.core.env.Environment; -import java.net.URI; import java.util.*; +import javax.annotation.PostConstruct; + import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.ListView; @@ -40,52 +42,37 @@ public class NacosDiscoveryClient implements DiscoveryClient { public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client"; @Autowired - private NacosRegistration nacosRegistration; + private NacosDiscoveryProperties discoveryProperties; + + @Autowired + private Environment environment; + + private NamingService namingService; @Override public String description() { return DESCRIPTION; } + @PostConstruct + public void init() { + discoveryProperties.overrideFromEnv(environment); + namingService = discoveryProperties.getNamingService(); + } + @Override public ServiceInstance getLocalServiceInstance() { - return new ServiceInstance() { - @Override - public String getServiceId() { - return nacosRegistration.getServiceId(); - } - - @Override - public String getHost() { - return nacosRegistration.getHost(); - } - - @Override - public int getPort() { - return nacosRegistration.getPort(); - } - - @Override - public boolean isSecure() { - return nacosRegistration.isSecure(); - } - - @Override - public URI getUri() { - return nacosRegistration.getUri(); - } - - @Override - public Map<String, String> getMetadata() { - return nacosRegistration.getMetadata(); - } - }; + String serviceId = discoveryProperties.getService(); + String host = discoveryProperties.getIp(); + int port = discoveryProperties.getPort(); + boolean secure = discoveryProperties.isSecure(); + Map<String, String> metadata = discoveryProperties.getMetadata(); + return new DefaultServiceInstance(serviceId, host, port, secure, metadata); } @Override public List<ServiceInstance> getInstances(String serviceId) { try { - NamingService namingService = nacosRegistration.getNacosNamingService(); List<Instance> instances = namingService.getAllInstances(serviceId); return hostToServiceInstanceList(instances, serviceId); } @@ -126,7 +113,6 @@ public class NacosDiscoveryClient implements DiscoveryClient { public List<String> getServices() { try { - NamingService namingService = nacosRegistration.getNacosNamingService(); ListView<String> services = namingService.getServicesOfServer(1, Integer.MAX_VALUE); return services.getData(); @@ -137,4 +123,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { } } + public NamingService getNamingService() { + return namingService; + } } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java index 2563cbe6..05049f4b 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java @@ -36,4 +36,10 @@ public class NacosDiscoveryClientAutoConfiguration { return new NacosDiscoveryClient(); } + @Bean + @ConditionalOnMissingBean + public NacosDiscoveryProperties nacosProperties() { + return new NacosDiscoveryProperties(); + } + } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java index 43b6a5c7..aa9271a8 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java @@ -16,6 +16,8 @@ package org.springframework.cloud.alibaba.nacos; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -33,6 +35,18 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.Properties; + +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.client.naming.utils.UtilAndComs; + +import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME; +import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT; +import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE; +import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR; /** * @author dungu.zpf @@ -42,6 +56,9 @@ import java.util.Objects; @ConfigurationProperties("spring.cloud.nacos.discovery") public class NacosDiscoveryProperties { + private static final Logger LOGGER = LoggerFactory + .getLogger(NacosDiscoveryProperties.class); + /** * nacos discovery server address */ @@ -333,4 +350,22 @@ public class NacosDiscoveryProperties { } } + public NamingService getNamingService() { + Properties properties = new Properties(); + properties.put(SERVER_ADDR, serverAddr); + properties.put(NAMESPACE, namespace); + properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME, logName); + properties.put(ENDPOINT, endpoint); + properties.put(ACCESS_KEY, accessKey); + properties.put(SECRET_KEY, secretKey); + properties.put(CLUSTER_NAME, clusterName); + try { + return NacosFactory.createNamingService(properties); + } + catch (Exception e) { + LOGGER.error("create naming service error!properties={},e=,", this, e); + return null; + } + } + } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java index a68f6300..dfa1fbb6 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java @@ -28,8 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.AbstractEndpoint; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; -import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; /** * Endpoint for nacos discovery, get nacos properties and subscribed services @@ -44,7 +44,7 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object> private NacosDiscoveryProperties nacosDiscoveryProperties; @Autowired - private NacosRegistration nacosRegistration; + private NacosDiscoveryClient discoveryClient; public NacosDiscoveryEndpoint() { super("nacos_discovery", false); @@ -58,7 +58,7 @@ public class NacosDiscoveryEndpoint extends AbstractEndpoint<Map<String, Object> Map<String, Object> result = new HashMap<>(); result.put("NacosDiscoveryProperties", nacosDiscoveryProperties); - NamingService namingService = nacosRegistration.getNacosNamingService(); + NamingService namingService = discoveryClient.getNamingService(); List<ServiceInfo> subscribe = Collections.emptyList(); try { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java index 5278cd3b..eab95411 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java @@ -26,7 +26,6 @@ import org.springframework.context.annotation.Configuration; * @author xiaojing */ @Configuration -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) @ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.AbstractEndpoint") public class NacosDiscoveryEndpointAutoConfiguration { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java index 1fc12d7f..872d7dd8 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java @@ -28,15 +28,10 @@ import org.springframework.util.StringUtils; import java.net.URI; import java.util.Map; -import java.util.Properties; import javax.annotation.PostConstruct; -import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.client.naming.utils.UtilAndComs; - -import static com.alibaba.nacos.api.PropertyKeyConst.*; /** * @author xiaojing @@ -60,22 +55,7 @@ public class NacosRegistration implements Registration, ServiceInstance { Environment env = context.getEnvironment(); nacosDiscoveryProperties.overrideFromEnv(context.getEnvironment()); - - Properties properties = new Properties(); - properties.put(SERVER_ADDR, nacosDiscoveryProperties.getServerAddr()); - properties.put(NAMESPACE, nacosDiscoveryProperties.getNamespace()); - properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME, - nacosDiscoveryProperties.getLogName()); - properties.put(ENDPOINT, nacosDiscoveryProperties.getEndpoint()); - properties.put(ACCESS_KEY, nacosDiscoveryProperties.getAccessKey()); - properties.put(SECRET_KEY, nacosDiscoveryProperties.getSecretKey()); - properties.put(CLUSTER_NAME, nacosDiscoveryProperties.getClusterName()); - try { - nacosNamingService = NacosFactory.createNamingService(properties); - } - catch (Exception e) { - - } + nacosNamingService = nacosDiscoveryProperties.getNamingService(); Integer managementPort = ManagementServerPortUtils.getPort(context); if (null != managementPort) { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java index 3eb43bbc..c85339c3 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java @@ -19,7 +19,9 @@ package org.springframework.cloud.alibaba.nacos.ribbon; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.AbstractServerList; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient; import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; +import org.springframework.cloud.client.discovery.DiscoveryClient; import java.util.ArrayList; import java.util.List; @@ -32,7 +34,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance; public class NacosServerList extends AbstractServerList<NacosServer> { @Autowired - private NacosRegistration registration; + private NacosDiscoveryClient discoveryClient; private String serviceId; @@ -55,7 +57,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> { private List<NacosServer> getServers() { try { - List<Instance> instances = registration.getNacosNamingService() + List<Instance> instances = discoveryClient.getNamingService() .getAllInstances(serviceId); return instancesToServerList(instances); } diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java index 1fe9fdaa..4be0dd92 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java @@ -42,6 +42,7 @@ public class NacosDiscoveryAutoConfigurationTests { @Before public void setUp() throws Exception { this.context = new SpringApplicationBuilder(NacosDiscoveryTestConfiguration.class, + NacosDiscoveryClientAutoConfiguration.class, NacosDiscoveryAutoConfiguration.class).web(false).run( "--spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080", "--spring.cloud.nacos.discovery.port=18080", diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java index f0354b34..c0f808d9 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java @@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.loadbalancer.LoadBalanced; @@ -33,6 +34,7 @@ public class NacosRibbonClientConfigurationTests { public void setUp() throws Exception { this.context = new SpringApplicationBuilder(NacosRibbonTestConfiguration.class, NacosDiscoveryAutoConfiguration.class, + NacosDiscoveryClientAutoConfiguration.class, NacosRibbonClientConfiguration.class, RibbonNacosAutoConfiguration.class) .web(false).run("--server.port=18080", "--spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080",

['spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java', 'spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java']

{'.java': 10}

Java

{'Java': 1218311, 'HTML': 9491, 'Shell': 2729, 'Dockerfile': 1686, 'JavaScript': 860}

Apache License 2.0

alibaba/spring-cloud-alibaba/47/42

alibaba

spring-cloud-alibaba

https://github.com/alibaba/spring-cloud-alibaba/issues/42

https://github.com/alibaba/spring-cloud-alibaba/pull/47

https://github.com/alibaba/spring-cloud-alibaba/pull/47

fixes

Setting false on autoRegister of @EnableDiscoveryClient will throw exception and application failed to start

Description: Field nacosRegistration in org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient required a bean of type 'org.springframework.cloud.alibaba.nacos.registry.NacosRegistration' that could not be found. - Bean method 'nacosRegistration' not loaded because @ConditionalOnProperty (spring.cloud.service-registry.auto-registration.enabled) found different value in property 'spring.cloud.service-registry.auto-registration.enabled'

1ce28f00f3255aba56662e2ab75e3e70d679b522

47cab99b2c767e4ce3ff8c0c73a7021ac4fa3f78

https://github.com/alibaba/spring-cloud-alibaba/compare/1ce28f00f3255aba56662e2ab75e3e70d679b522...47cab99b2c767e4ce3ff8c0c73a7021ac4fa3f78

diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java index b6180144..21a8d303 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java @@ -48,12 +48,6 @@ public class NacosDiscoveryAutoConfiguration { return new NacosServiceRegistry(); } - @Bean - @ConditionalOnMissingBean - public NacosDiscoveryProperties nacosProperties() { - return new NacosDiscoveryProperties(); - } - @Bean @ConditionalOnBean(AutoServiceRegistrationProperties.class) public NacosRegistration nacosRegistration() { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java index d32a6b0d..59ea1ec7 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java @@ -19,12 +19,15 @@ package org.springframework.cloud.alibaba.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; +import org.springframework.cloud.client.DefaultServiceInstance; import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.core.env.Environment; import java.util.*; +import javax.annotation.PostConstruct; + import com.alibaba.nacos.api.naming.NamingService; import com.alibaba.nacos.api.naming.pojo.Instance; import com.alibaba.nacos.api.naming.pojo.ListView; @@ -39,7 +42,18 @@ public class NacosDiscoveryClient implements DiscoveryClient { public static final String DESCRIPTION = "Spring Cloud Nacos Discovery Client"; @Autowired - private NacosRegistration nacosRegistration; + private NacosDiscoveryProperties discoveryProperties; + + @Autowired + private Environment environment; + + private NamingService namingService; + + @PostConstruct + public void init() { + discoveryProperties.overrideFromEnv(environment); + namingService = discoveryProperties.getNamingService(); + } @Override public String description() { @@ -49,7 +63,6 @@ public class NacosDiscoveryClient implements DiscoveryClient { @Override public List<ServiceInstance> getInstances(String serviceId) { try { - NamingService namingService = nacosRegistration.getNacosNamingService(); List<Instance> instances = namingService.getAllInstances(serviceId); return hostToServiceInstanceList(instances, serviceId); } @@ -79,7 +92,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { List<Instance> instances, String serviceId) { List<ServiceInstance> result = new ArrayList<ServiceInstance>(instances.size()); for (Instance instance : instances) { - if(instance.isHealthy()) { + if (instance.isHealthy()) { result.add(hostToServiceInstance(instance, serviceId)); } } @@ -90,7 +103,6 @@ public class NacosDiscoveryClient implements DiscoveryClient { public List<String> getServices() { try { - NamingService namingService = nacosRegistration.getNacosNamingService(); ListView<String> services = namingService.getServicesOfServer(1, Integer.MAX_VALUE); return services.getData(); @@ -101,4 +113,7 @@ public class NacosDiscoveryClient implements DiscoveryClient { } } + public NamingService getNamingService() { + return namingService; + } } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java index 2563cbe6..05049f4b 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java @@ -36,4 +36,10 @@ public class NacosDiscoveryClientAutoConfiguration { return new NacosDiscoveryClient(); } + @Bean + @ConditionalOnMissingBean + public NacosDiscoveryProperties nacosProperties() { + return new NacosDiscoveryProperties(); + } + } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java index 43b6a5c7..aa9271a8 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java @@ -16,6 +16,8 @@ package org.springframework.cloud.alibaba.nacos; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -33,6 +35,18 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.Properties; + +import com.alibaba.nacos.api.NacosFactory; +import com.alibaba.nacos.api.naming.NamingService; +import com.alibaba.nacos.client.naming.utils.UtilAndComs; + +import static com.alibaba.nacos.api.PropertyKeyConst.ACCESS_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.CLUSTER_NAME; +import static com.alibaba.nacos.api.PropertyKeyConst.ENDPOINT; +import static com.alibaba.nacos.api.PropertyKeyConst.NAMESPACE; +import static com.alibaba.nacos.api.PropertyKeyConst.SECRET_KEY; +import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR; /** * @author dungu.zpf @@ -42,6 +56,9 @@ import java.util.Objects; @ConfigurationProperties("spring.cloud.nacos.discovery") public class NacosDiscoveryProperties { + private static final Logger LOGGER = LoggerFactory + .getLogger(NacosDiscoveryProperties.class); + /** * nacos discovery server address */ @@ -333,4 +350,22 @@ public class NacosDiscoveryProperties { } } + public NamingService getNamingService() { + Properties properties = new Properties(); + properties.put(SERVER_ADDR, serverAddr); + properties.put(NAMESPACE, namespace); + properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME, logName); + properties.put(ENDPOINT, endpoint); + properties.put(ACCESS_KEY, accessKey); + properties.put(SECRET_KEY, secretKey); + properties.put(CLUSTER_NAME, clusterName); + try { + return NacosFactory.createNamingService(properties); + } + catch (Exception e) { + LOGGER.error("create naming service error!properties={},e=,", this, e); + return null; + } + } + } diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java index da49d6c2..db384df5 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java @@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient; import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; -import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; /** * Endpoint for nacos discovery, get nacos properties and subscribed services @@ -46,7 +46,7 @@ public class NacosDiscoveryEndpoint { private NacosDiscoveryProperties nacosDiscoveryProperties; @Autowired - private NacosRegistration nacosRegistration; + private NacosDiscoveryClient discoveryClient; /** * @return nacos discovery endpoint @@ -56,7 +56,7 @@ public class NacosDiscoveryEndpoint { Map<String, Object> result = new HashMap<>(); result.put("NacosDiscoveryProperties", nacosDiscoveryProperties); - NamingService namingService = nacosRegistration.getNacosNamingService(); + NamingService namingService = discoveryClient.getNamingService(); List<ServiceInfo> subscribe = Collections.emptyList(); try { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java index 2b6c4635..c8716ad4 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java @@ -28,7 +28,6 @@ import org.springframework.context.annotation.Configuration; * @author xiaojing */ @Configuration -@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true) @ConditionalOnClass(Endpoint.class) public class NacosDiscoveryEndpointAutoConfiguration { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java index 4d923fac..639dad98 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java @@ -28,15 +28,10 @@ import org.springframework.util.StringUtils; import java.net.URI; import java.util.Map; -import java.util.Properties; import javax.annotation.PostConstruct; -import com.alibaba.nacos.api.NacosFactory; import com.alibaba.nacos.api.naming.NamingService; -import com.alibaba.nacos.client.naming.utils.UtilAndComs; - -import static com.alibaba.nacos.api.PropertyKeyConst.*; /** * @author xiaojing @@ -60,22 +55,7 @@ public class NacosRegistration implements Registration, ServiceInstance { Environment env = context.getEnvironment(); nacosDiscoveryProperties.overrideFromEnv(context.getEnvironment()); - - Properties properties = new Properties(); - properties.put(SERVER_ADDR, nacosDiscoveryProperties.getServerAddr()); - properties.put(NAMESPACE, nacosDiscoveryProperties.getNamespace()); - properties.put(UtilAndComs.NACOS_NAMING_LOG_NAME, - nacosDiscoveryProperties.getLogName()); - properties.put(ENDPOINT, nacosDiscoveryProperties.getEndpoint()); - properties.put(ACCESS_KEY, nacosDiscoveryProperties.getAccessKey()); - properties.put(SECRET_KEY, nacosDiscoveryProperties.getSecretKey()); - properties.put(CLUSTER_NAME, nacosDiscoveryProperties.getClusterName()); - try { - nacosNamingService = NacosFactory.createNamingService(properties); - } - catch (Exception e) { - - } + nacosNamingService = nacosDiscoveryProperties.getNamingService(); Integer managementPort = ManagementServerPortUtils.getPort(context); if (null != managementPort) { diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java index 3eb43bbc..26145662 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java +++ b/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java @@ -19,7 +19,7 @@ package org.springframework.cloud.alibaba.nacos.ribbon; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.AbstractServerList; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClient; import java.util.ArrayList; import java.util.List; @@ -32,7 +32,7 @@ import com.alibaba.nacos.api.naming.pojo.Instance; public class NacosServerList extends AbstractServerList<NacosServer> { @Autowired - private NacosRegistration registration; + private NacosDiscoveryClient discoveryClient; private String serviceId; @@ -55,7 +55,7 @@ public class NacosServerList extends AbstractServerList<NacosServer> { private List<NacosServer> getServers() { try { - List<Instance> instances = registration.getNacosNamingService() + List<Instance> instances = discoveryClient.getNamingService() .getAllInstances(serviceId); return instancesToServerList(instances); } diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java index b7e5d801..3d15a8fc 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java @@ -37,7 +37,8 @@ public class NacosDiscoveryAutoConfigurationTests { private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() .withConfiguration( AutoConfigurations.of(NacosDiscoveryTestConfiguration.class, - NacosDiscoveryAutoConfiguration.class)) + NacosDiscoveryAutoConfiguration.class, + NacosDiscoveryClientAutoConfiguration.class)) .withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080") .withPropertyValues("spring.cloud.nacos.discovery.port=18080") .withPropertyValues("spring.cloud.nacos.discovery.service=myapp"); diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java index 8c6da429..ad5da1b2 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java +++ b/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java @@ -6,6 +6,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryClientAutoConfiguration; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.loadbalancer.LoadBalanced; import org.springframework.context.annotation.Bean; @@ -19,49 +20,43 @@ import static org.assertj.core.api.Assertions.assertThat; */ public class NacosRibbonClientConfigurationTests { - - private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() - .withConfiguration( - AutoConfigurations.of(NacosRibbonTestConfiguration.class, - NacosRibbonClientConfiguration.class, - RibbonNacosAutoConfiguration.class)) - .withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080") - .withPropertyValues("spring.cloud.nacos.discovery.port=18080") - .withPropertyValues("spring.cloud.nacos.discovery.service=myapp"); - - - - @Test - public void testProperties() { - - this.contextRunner.run(context -> { - NacosServerList serverList = context.getBean(NacosServerList.class); - assertThat(serverList.getServiceId()).isEqualTo("myapp"); - }); - } - - - @Configuration - @EnableAutoConfiguration - @EnableDiscoveryClient - static class NacosRibbonTestConfiguration { - - - @Bean - IClientConfig iClientConfig(){ - //return new IClientConfig.Builder().s.build(); - DefaultClientConfigImpl config = new DefaultClientConfigImpl(); - config.setClientName("myapp"); - return config; - } - - - @Bean - @LoadBalanced - RestTemplate restTemplate(){ - return new RestTemplate(); - } - - } + private WebApplicationContextRunner contextRunner = new WebApplicationContextRunner() + .withConfiguration(AutoConfigurations.of(NacosRibbonTestConfiguration.class, + NacosRibbonClientConfiguration.class, + NacosDiscoveryClientAutoConfiguration.class, + RibbonNacosAutoConfiguration.class)) + .withPropertyValues("spring.cloud.nacos.discovery.server-addr=127.0.0.1:8080") + .withPropertyValues("spring.cloud.nacos.discovery.port=18080") + .withPropertyValues("spring.cloud.nacos.discovery.service=myapp"); + + @Test + public void testProperties() { + + this.contextRunner.run(context -> { + NacosServerList serverList = context.getBean(NacosServerList.class); + assertThat(serverList.getServiceId()).isEqualTo("myapp"); + }); + } + + @Configuration + @EnableAutoConfiguration + @EnableDiscoveryClient + static class NacosRibbonTestConfiguration { + + @Bean + IClientConfig iClientConfig() { + // return new IClientConfig.Builder().s.build(); + DefaultClientConfigImpl config = new DefaultClientConfigImpl(); + config.setClientName("myapp"); + return config; + } + + @Bean + @LoadBalanced + RestTemplate restTemplate() { + return new RestTemplate(); + } + + } }

['spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java', 'spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfigurationTests.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClient.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java', 'spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java']

{'.java': 10}

Java

{'Java': 1218311, 'HTML': 9491, 'Shell': 2729, 'Dockerfile': 1686, 'JavaScript': 860}

Apache License 2.0

seata/seata/104/101

seata

seata

https://github.com/seata/seata/issues/101

https://github.com/seata/seata/pull/104

https://github.com/seata/seata/pull/104

fixed

Instance will cause RMClientAT.init to execute twice

Once in the main method // 一次是main 方法里面 > String applicationId = "dubbo-demo-account-service"; > String txServiceGroup = "my_test_tx_group"; > RMClientAT.init(applicationId, txServiceGroup); Once is the xml inside GlobalTransactionScanner // 一次是xml 里面GlobalTransactionScanner > if ((AT_MODE & mode) > 0) { RMClientAT.init(applicationId, txServiceGroup); Will cause the AsyncWorker.init() method timerExecutor to be created 2 times and call the doBranchCommits() method. // 会造成AsyncWorker.init()方法timerExecutor 创建2次，并调用doBranchCommits()方法 The author intended that the RMClient could be created by code or xml's GlobalTransactionScanner method, but the document did not specify the information. // 作者本意是可以通过代码或者xml 的GlobalTransactionScanner方式去创建RMClient，但是文档没有说明该条信息 *** WE STRONGLY SUGGEST YOU TO DESCRIBE YOUR ISSUE IN ENGLISH ***

33275c72a103116e72936d5b91b4a19cc29924a3

5c411383274ee97f3128615a7013707ab93b6275

https://github.com/seata/seata/compare/33275c72a103116e72936d5b91b4a19cc29924a3...5c411383274ee97f3128615a7013707ab93b6275

diff --git a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/AccountServiceImpl.java b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/AccountServiceImpl.java index ed22f2a4a..401fa22f3 100644 --- a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/AccountServiceImpl.java +++ b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/AccountServiceImpl.java @@ -56,8 +56,6 @@ public class AccountServiceImpl implements AccountService { String applicationId = "dubbo-demo-account-service"; String txServiceGroup = "my_test_tx_group"; - RMClientAT.init(applicationId, txServiceGroup); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"dubbo-account-service.xml"}); context.getBean("service"); JdbcTemplate jdbcTemplate = (JdbcTemplate) context.getBean("jdbcTemplate"); diff --git a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/OrderServiceImpl.java b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/OrderServiceImpl.java index 5a655b9ca..4093415ee 100644 --- a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/OrderServiceImpl.java +++ b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/OrderServiceImpl.java @@ -106,8 +106,6 @@ public class OrderServiceImpl implements OrderService { String applicationId = "dubbo-demo-order-service"; String txServiceGroup = "my_test_tx_group"; - RMClientAT.init(applicationId, txServiceGroup); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"dubbo-order-service.xml"}); context.getBean("service"); JdbcTemplate jdbcTemplate = (JdbcTemplate) context.getBean("jdbcTemplate"); diff --git a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/StorageServiceImpl.java b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/StorageServiceImpl.java index c67bc3d27..c6a00357f 100644 --- a/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/StorageServiceImpl.java +++ b/examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/StorageServiceImpl.java @@ -55,8 +55,6 @@ public class StorageServiceImpl implements StorageService { String applicationId = "dubbo-demo-storage-service"; String txServiceGroup = "my_test_tx_group"; - RMClientAT.init(applicationId, txServiceGroup); - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[]{"dubbo-storage-service.xml"}); context.getBean("service"); JdbcTemplate jdbcTemplate = (JdbcTemplate) context.getBean("jdbcTemplate");

['examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/AccountServiceImpl.java', 'examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/StorageServiceImpl.java', 'examples/src/main/java/com/alibaba/fescar/tm/dubbo/impl/OrderServiceImpl.java']

{'.java': 3}