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

post-trunk rebase fixes

This commit is contained in:
Blake Eggleston 2024-03-27 09:18:39 -07:00 committed by David Capwell
parent 94c2ec3c96
commit 599cd59736
9 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/accord

@ -1 +1 @@
Subproject commit 6b8bef48e5780aefda6bd1ff29a6290e56ede438
Subproject commit ef36616441bd4ff4fec5379d986c75ad5a62ff7d

3
src/java/org/apache/cassandra/cql3/selection/MapSelector.java
View File

@ -34,6 +34,7 @@ import org.apache.cassandra.cql3.functions.Function;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.db.filter.ColumnFilter.Builder;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.ByteBufferAccessor;
import org.apache.cassandra.db.marshal.MapType;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
@ -217,7 +218,7 @@ final class MapSelector extends Selector
buffers.add(entry.getKey());
buffers.add(entry.getValue());
}
return type.pack(buffers);
return type.pack(buffers, ByteBufferAccessor.instance);
}
public void reset()

4
src/java/org/apache/cassandra/exceptions/RequestFailure.java
View File

@ -41,7 +41,6 @@ public class RequestFailure
{
public static final RequestFailure UNKNOWN = new RequestFailure(RequestFailureReason.UNKNOWN);
public static final RequestFailure READ_TOO_MANY_TOMBSTONES = new RequestFailure(RequestFailureReason.READ_TOO_MANY_TOMBSTONES);
public static final RequestFailure READ_TOO_MANY_INDEXES = new RequestFailure(RequestFailureReason.READ_TOO_MANY_INDEXES);
public static final RequestFailure TIMEOUT = new RequestFailure(RequestFailureReason.TIMEOUT);
public static final RequestFailure INCOMPATIBLE_SCHEMA = new RequestFailure(RequestFailureReason.INCOMPATIBLE_SCHEMA);
public static final RequestFailure READ_SIZE = new RequestFailure(RequestFailureReason.READ_SIZE);
@ -50,6 +49,7 @@ public class RequestFailure
public static final RequestFailure INVALID_ROUTING = new RequestFailure(RequestFailureReason.INVALID_ROUTING);
public static final RequestFailure INDEX_NOT_AVAILABLE = new RequestFailure(RequestFailureReason.INDEX_NOT_AVAILABLE);
public static final RequestFailure COORDINATOR_BEHIND = new RequestFailure(RequestFailureReason.COORDINATOR_BEHIND);
public static final RequestFailure READ_TOO_MANY_INDEXES = new RequestFailure(RequestFailureReason.READ_TOO_MANY_INDEXES);
static
{
@ -124,7 +124,6 @@ public class RequestFailure
default: throw new IllegalStateException("Unhandled request failure reason " + reason);
case UNKNOWN: return UNKNOWN;
case READ_TOO_MANY_TOMBSTONES: return READ_TOO_MANY_TOMBSTONES;
case READ_TOO_MANY_INDEXES: return READ_TOO_MANY_INDEXES;
case TIMEOUT: return TIMEOUT;
case INCOMPATIBLE_SCHEMA: return INCOMPATIBLE_SCHEMA;
case READ_SIZE: return READ_SIZE;
@ -133,6 +132,7 @@ public class RequestFailure
case INVALID_ROUTING: return INVALID_ROUTING;
case INDEX_NOT_AVAILABLE: return INDEX_NOT_AVAILABLE;
case COORDINATOR_BEHIND: return COORDINATOR_BEHIND;
case READ_TOO_MANY_INDEXES: return READ_TOO_MANY_INDEXES;
}
}

3
test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java
View File

@ -39,6 +39,7 @@ import org.junit.BeforeClass;
import org.apache.cassandra.cql3.Duration;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.BooleanType;
import org.apache.cassandra.db.marshal.ByteBufferAccessor;
import org.apache.cassandra.db.marshal.ByteType;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.DecimalType;
@ -132,7 +133,7 @@ public class TestBaseImpl extends DistributedTestBase
bbs.add(value == null ? null : type.decompose(value));
}
TupleType tupleType = new TupleType(types);
return tupleType.pack(bbs);
return tupleType.pack(bbs, ByteBufferAccessor.instance);
}
public static String batch(String... queries)

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

@ -66,6 +66,8 @@ import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import org.apache.cassandra.db.marshal.ByteBufferAccessor;
import org.assertj.core.api.Assertions;
import org.awaitility.Awaitility;
import org.apache.commons.lang3.ArrayUtils;
@ -3003,7 +3005,7 @@ public abstract class CQLTester
types.add(type);
bbs.add(makeByteBuffer(value, type));
}
return new TupleType(types).pack(bbs);
return new TupleType(types).pack(bbs, ByteBufferAccessor.instance);
}
public String toCQLString()

2
test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java
View File

@ -204,7 +204,7 @@ public class TypeValidationTest
qt().forAll(tupleWithValueGen(baseGen)).checkAssert(pair -> {
TupleType tuple = pair.left;
ByteBuffer value = pair.right;
Assertions.assertThat(tuple.pack(tuple.unpack(value)))
Assertions.assertThat(tuple.pack(tuple.unpack(value), ByteBufferAccessor.instance))
.as("tuple.pack(tuple.unpack(value)) == value")
.isEqualTo(value);
});

2
test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java
View File

@ -135,7 +135,7 @@ public class LargePartitionsTest extends CQLTester
" size:" + metrics.size.getValue() +
" entries:" + metrics.entries.getValue() +
" hit-rate:" + metrics.hitRate.getValue() +
" one-min-rate:" + metrics.hitRate.getValue());
" one-min-rate:" + metrics.oneMinuteHitRate.getValue());
}
@Test

13
test/unit/org/apache/cassandra/transport/SerDeserTest.java
View File

@ -50,6 +50,7 @@ import org.apache.cassandra.cql3.terms.Term;
import org.apache.cassandra.cql3.terms.UserTypes;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.ByteBufferAccessor;
import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.db.marshal.ListType;
import org.apache.cassandra.db.marshal.LongType;
@ -94,7 +95,7 @@ public class SerDeserTest
for (Integer i : l)
lb.add(Int32Type.instance.decompose(i));
assertEquals(l, lt.compose(lt.pack(lb)));
assertEquals(l, lt.compose(lt.pack(lb, ByteBufferAccessor.instance)));
// Sets
SetType<?> st = SetType.getInstance(UTF8Type.instance, true);
@ -104,7 +105,7 @@ public class SerDeserTest
for (String t : s)
sb.add(UTF8Type.instance.decompose(t));
assertEquals(s, st.compose(st.pack(sb)));
assertEquals(s, st.compose(st.pack(sb, ByteBufferAccessor.instance)));
// Maps
MapType<?, ?> mt = MapType.getInstance(UTF8Type.instance, LongType.instance, true);
@ -120,7 +121,7 @@ public class SerDeserTest
mb.add(LongType.instance.decompose(entry.getValue()));
}
assertEquals(m, mt.compose(mt.pack(mb)));
assertEquals(m, mt.compose(mt.pack(mb, ByteBufferAccessor.instance)));
}
@Test(expected = MarshalException.class)
@ -130,7 +131,7 @@ public class SerDeserTest
List<ByteBuffer> sb = new ArrayList<>(1);
sb.add(null);
st.compose(st.pack(sb));
st.compose(st.pack(sb, ByteBufferAccessor.instance));
}
@Test(expected = MarshalException.class)
@ -141,7 +142,7 @@ public class SerDeserTest
mb.add(null);
mb.add(LongType.instance.decompose(999L));
mt.compose(mt.pack(mb));
mt.compose(mt.pack(mb, ByteBufferAccessor.instance));
}
@Test(expected = MarshalException.class)
@ -152,7 +153,7 @@ public class SerDeserTest
mb.add(UTF8Type.instance.decompose("danger"));
mb.add(null);
mt.compose(mt.pack(mb));
mt.compose(mt.pack(mb, ByteBufferAccessor.instance));
}
@Test

2
test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java
View File

@ -1382,7 +1382,7 @@ public final class AbstractTypeGenerators
TypeSupport<Object> support = eSupport.get(i);
elements.add(support.type.decompose(support.valueGen.generate(rnd)));
}
return type.pack(elements);
return type.pack(elements, ByteBufferAccessor.instance);
}
}