Merge remote-tracking branch 'datastax/3.x'

Author: srfrnk

changelog/README.md

@@ -6,6 +6,10 @@
 - [improvement] JAVA-1980: Use covariant return types in RemoteEndpointAwareJdkSSLOptions.Builder methods.
 - [documentation] JAVA-2062: Document frozen collection preference with Mapper.
 - [bug] JAVA-2071: Fix NPE in ArrayBackedRow.toString().
+- [bug] JAVA-2070: Call onRemove instead of onDown when rack and/or DC information changes for a host.
+- [improvement] JAVA-1256: Log parameters of BuiltStatement in QueryLogger.
+- [documentation] JAVA-2074: Document preference for LZ4 over Snappy.
+- [bug] JAVA-1612: Include netty-common jar in binary tarball.
 
 
 ### 3.6.0

driver-core/src/main/java/com/datastax/driver/core/ControlConnection.java

@@ -671,7 +671,7 @@ private static void updateLocationInfo(
     // policy.
     // For that, we remove and re-add the node against the policy. Not the most elegant, and assumes
     // that the policy will update correctly, but in practice this should work.
-    if (!isInitialConnection) cluster.loadBalancingPolicy().onDown(host);
+    if (!isInitialConnection) cluster.loadBalancingPolicy().onRemove(host);
     host.setLocationInfo(datacenter, rack);
     if (!isInitialConnection) cluster.loadBalancingPolicy().onAdd(host);
   }

driver-core/src/main/java/com/datastax/driver/core/QueryLogger.java

@@ -17,6 +17,7 @@
 
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
+import com.datastax.driver.core.querybuilder.BuiltStatement;
 import com.google.common.annotations.VisibleForTesting;
 import java.nio.ByteBuffer;
 import java.util.Iterator;
@@ -704,6 +705,8 @@ protected void logQuery(Statement statement, Exception exception, Logger logger,
             remaining = appendParameters((SimpleStatement) inner, params, remaining);
           }
         }
+      } else if (statement instanceof BuiltStatement) {
+        appendParameters((BuiltStatement) statement, params, maxLoggedParameters);
       }
       if (params.length() > 0) params.append("]");
       logger.trace(message + params, exception);
@@ -865,6 +868,38 @@ protected String parameterValueAsString(Object value) {
     return valueStr;
   }
 
+  protected int appendParameters(BuiltStatement statement, StringBuilder buffer, int remaining) {
+    if (remaining == 0) {
+      return 0;
+    }
+    int numberOfParameters =
+        statement.getValues(protocolVersion(), cluster.getConfiguration().getCodecRegistry())
+            .length;
+    if (numberOfParameters > 0) {
+      int numberOfLoggedParameters;
+      if (remaining == -1) {
+        numberOfLoggedParameters = numberOfParameters;
+      } else {
+        numberOfLoggedParameters = remaining > numberOfParameters ? numberOfParameters : remaining;
+        remaining -= numberOfLoggedParameters;
+      }
+
+      for (int i = 0; i < numberOfLoggedParameters; i++) {
+        if (buffer.length() == 0) {
+          buffer.append(" [");
+        } else {
+          buffer.append(", ");
+        }
+
+        buffer.append(parameterValueAsString(statement.getObject(i)));
+      }
+      if (numberOfLoggedParameters < numberOfParameters) {
+        buffer.append(FURTHER_PARAMS_OMITTED);
+      }
+    }
+    return remaining;
+  }
+
   private ProtocolVersion protocolVersion() {
     // Since the QueryLogger can be registered before the Cluster was initialized, we can't retrieve
     // it at construction time. Cache it field at first use (a volatile field is good enough since

driver-core/src/test/java/com/datastax/driver/core/QueryLoggerTest.java

@@ -25,6 +25,9 @@
 import static com.datastax.driver.core.QueryLogger.TRUNCATED_OUTPUT;
 import static com.datastax.driver.core.TestUtils.getFixedValue;
 import static com.datastax.driver.core.TestUtils.ipOfNode;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.set;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.update;
 import static org.apache.log4j.Level.DEBUG;
 import static org.apache.log4j.Level.INFO;
 import static org.apache.log4j.Level.TRACE;
@@ -33,6 +36,7 @@
 
 import com.datastax.driver.core.StatementWrapperTest.CustomStatement;
 import com.datastax.driver.core.exceptions.DriverException;
+import com.datastax.driver.core.querybuilder.BuiltStatement;
 import com.datastax.driver.core.utils.CassandraVersion;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
@@ -63,9 +67,9 @@ public class QueryLoggerTest extends CCMTestsSupport {
   private List<Object> values;
   private String assignments;
 
-  private Logger normal = Logger.getLogger(NORMAL_LOGGER.getName());
-  private Logger slow = Logger.getLogger(SLOW_LOGGER.getName());
-  private Logger error = Logger.getLogger(ERROR_LOGGER.getName());
+  private final Logger normal = Logger.getLogger(NORMAL_LOGGER.getName());
+  private final Logger slow = Logger.getLogger(SLOW_LOGGER.getName());
+  private final Logger error = Logger.getLogger(ERROR_LOGGER.getName());
 
   private MemoryAppender normalAppender;
   private MemoryAppender slowAppender;
@@ -461,6 +465,23 @@ public void should_log_non_null_positional_parameter_bound_statements() throws E
         .contains("c_text:'foo'");
   }
 
+  @Test(groups = "short")
+  @CassandraVersion("2.0.0")
+  public void should_log_non_null_parameters_built_statements() throws Exception {
+    // given
+    normal.setLevel(TRACE);
+    queryLogger = QueryLogger.builder().build();
+    cluster().register(queryLogger);
+
+    // when
+    BuiltStatement update = update("test").with(set("c_text", "foo")).where(eq("pk", 42));
+    session().execute(update);
+
+    // then
+    String line = normalAppender.waitAndGet(10000);
+    assertThat(line).contains("['foo']");
+  }
+
   @Test(groups = "short")
   @CassandraVersion("2.0.0")
   public void should_log_non_null_positional_parameter_simple_statements() throws Exception {

driver-dist/src/assembly/binary-tarball.xml

@@ -45,7 +45,6 @@
                             <!-- platform-dependent -->
                             <exclude>io.netty:netty-transport-native-epoll:*</exclude>
                         </excludes>
-                        <useTransitiveFiltering>true</useTransitiveFiltering>
                     </dependencySet>
                 </dependencySets>
             </binaries>

manual/compression/README.md

@@ -12,12 +12,15 @@ will likely be beneficial when you have larger payloads.
 
 Two algorithms are available:
 [LZ4](https://github.com/jpountz/lz4-java) and
-[Snappy](https://code.google.com/p/snappy/).
+[Snappy](https://code.google.com/p/snappy/).  The LZ4 implementation is a good
+first choice; it offers fallback implementations in case native libraries fail
+to load and
+[benchmarks](http://java-performance.info/performance-general-compression/)
+suggest that it offers better performance and compression ratios over Snappy.
 Both rely on third-party libraries, declared by the driver as *optional*
-dependencies. So If you use a build tool like Maven, you'll need to
-declare an explicit dependency to pull the appropriate library in your
-application's classpath. Then you configure compression at driver
-startup.
+dependencies. So if you use a build tool like Maven, you'll need to declare an
+explicit dependency to pull the appropriate library in your application's
+classpath. Then you configure compression at driver startup.
 
 ### LZ4
 

manual/native_protocol/README.md

@@ -16,11 +16,12 @@ Cassandra when the first connection is established. Both sides are
 backward-compatible with older versions:
 
 <table border="1" style="text-align:center; width:100%;margin-bottom:1em;">
-<tr><td>&nbsp;</td><td>Cassandra: 1.2.x<br/>(DSE 3.2)</td><td>2.0.x<br/>(DSE 4.0 to 4.6)</td><td>2.1.x<br/>(DSE 4.7)</td><td>2.2.x</td><td>3.0.x</td></tr>
-<tr><td>Driver: 1.0.x</td> <td>v1</td> <td>v1</td>  <td>v1</td> <td>v1</td>  <td>Unsupported <i>(1)</i></td> </tr>
-<tr><td>2.0.x to 2.1.1</td> <td>v1</td> <td>v2</td>  <td>v2</td> <td>v2</td> <td>Unsupported <i>(1)</i></td> </tr>
-<tr><td>2.1.2 to 2.1.x</td> <td>v1</td> <td>v2</td>  <td>v3</td> <td>v3</td> <td>Unsupported <i>(2)</i></td> </tr>
-<tr><td>3.x</td> <td>v1</td> <td>v2</td>  <td>v3</td> <td>v4</td> <td>v4</td> </tr>
+<tr><th>Driver Version</th><th>Cassandra: 1.2.x<br/>(DSE 3.2)</th><th>2.0.x<br/>(DSE 4.0 to 4.6)
+</th><th>2.1.x<br/>(DSE 4.7)</th><th>2.2.x</th><th>3.0.x &amp; 3.x<br/>(DSE 5.0+)</th></tr>
+<tr><th>1.0.x</th> <td>v1</td> <td>v1</td>  <td>v1</td> <td>v1</td>  <td>Unsupported <i>(1)</i></td> </tr>
+<tr><th>2.0.x to 2.1.1</th> <td>v1</td> <td>v2</td>  <td>v2</td> <td>v2</td> <td>Unsupported <i>(1)</i></td> </tr>
+<tr><th>2.1.2 to 2.1.x</th> <td>v1</td> <td>v2</td>  <td>v3</td> <td>v3</td> <td>Unsupported <i>(2)</i></td> </tr>
+<tr><th>3.x</th> <td>v1</td> <td>v2</td>  <td>v3</td> <td>v4</td> <td>v4</td> </tr>
 </table>
 
 *(1) Cassandra 3.0 does not support protocol versions v1 and v2*