natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.8

This commit is contained in:
Tyler Hobbs 2016-08-17 17:05:15 -05:00
parent 4e46ec9261 01ae2794e5
commit 062bd0730a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.xml
View File

@ -1557,7 +1557,7 @@
</target>
<target name="test-all"
depends="eclipse-warnings,test,long-test,test-compression,test-clientutil-jar"
depends="eclipse-warnings,test,long-test,test-compression"
description="Run all tests except for those under test-burn" />
<!-- Use JaCoCo ant extension without needing externally saved lib -->

2
test/conf/logback-test.xml
View File

@ -70,7 +70,7 @@
<appender-ref ref="TEE"/>
</appender>
<root level="INFO">
<root level="DEBUG">
<appender-ref ref="ASYNC" />
</root>
</configuration>

12
test/unit/org/apache/cassandra/cql3/CQLTester.java
View File

@ -738,8 +738,8 @@ public abstract class CQLTester
UntypedResultSet rs;
if (usePrepared)
{
if (logger.isDebugEnabled())
logger.debug("Executing: {} with values {}", query, formatAllValues(values));
if (logger.isTraceEnabled())
logger.trace("Executing: {} with values {}", query, formatAllValues(values));
if (reusePrepared)
{
rs = QueryProcessor.executeInternal(query, transformValues(values));
@ -759,14 +759,14 @@ public abstract class CQLTester
else
{
query = replaceValues(query, values);
if (logger.isDebugEnabled())
logger.debug("Executing: {}", query);
if (logger.isTraceEnabled())
logger.trace("Executing: {}", query);
rs = QueryProcessor.executeOnceInternal(query);
}
if (rs != null)
{
if (logger.isDebugEnabled())
logger.debug("Got {} rows", rs.size());
if (logger.isTraceEnabled())
logger.trace("Got {} rows", rs.size());
}
return rs;
}