This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-3.11 by this push:
new 78555b9 fix broken merge
78555b9 is described below
commit 78555b904f66542146741d524e8c0c94b169ad0a
Author: Brandon Williams <[email protected]>
AuthorDate: Wed Jul 22 15:00:27 2020 -0500
fix broken merge
---
test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java | 6 +++---
test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java
b/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java
index 6c42a59..3652ac8 100644
--- a/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java
+++ b/test/unit/org/apache/cassandra/cql3/EmptyValuesTest.java
@@ -46,7 +46,7 @@ import org.apache.cassandra.db.marshal.TimestampType;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.transport.Server;
+import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assume.assumeTrue;
@@ -60,12 +60,12 @@ public class EmptyValuesTest extends CQLTester
Assert.assertTrue(row.getColumns().stream().anyMatch(c ->
c.name.toString().equals("v")));
Assert.assertEquals(0, row.getBytes("v").remaining());
- ResultSet resultNet = executeNet(Server.CURRENT_VERSION, "SELECT *
FROM %s");
+ ResultSet resultNet = executeNet(ProtocolVersion.CURRENT, "SELECT *
FROM %s");
Row rowNet = resultNet.one();
Assert.assertTrue(rowNet.getColumnDefinitions().contains("v"));
Assert.assertEquals(0, rowNet.getBytesUnsafe("v").remaining());
- ResultSet jsonNet = executeNet(Server.CURRENT_VERSION, "SELECT JSON *
FROM %s");
+ ResultSet jsonNet = executeNet(ProtocolVersion.CURRENT, "SELECT JSON *
FROM %s");
Row jsonRowNet = jsonNet.one();
Assert.assertTrue(jsonRowNet.getString("[json]"),
jsonRowNet.getString("[json]").matches(".*\"v\"\\s*:\\s*\"" +
Pattern.quote(emptyValue) + "\".*"));
diff --git a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java
b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java
index 74e5ef3..23b1922 100644
--- a/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/UUIDTypeTest.java
@@ -31,7 +31,7 @@ import java.util.UUID;
import org.junit.Test;
import junit.framework.Assert;
-import org.apache.cassandra.transport.Server;
+import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.UUIDGen;
import org.slf4j.Logger;
@@ -47,7 +47,7 @@ public class UUIDTypeTest
@Test //CASSANDRA-15896
public void testToJsonEmptyValue()
{
- String res =
uuidType.toJSONString(uuidType.fromJSONObject("").bindAndGet(null),
Server.CURRENT_VERSION);
+ String res =
uuidType.toJSONString(uuidType.fromJSONObject("").bindAndGet(null),
ProtocolVersion.CURRENT);
assertEquals("\"\"", res);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
