ifesdjeen commented on code in PR #4241: URL: https://github.com/apache/cassandra/pull/4241#discussion_r2198632709
########## src/java/org/apache/cassandra/db/marshal/PseudoUtf8Type.java: ########## @@ -0,0 +1,83 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db.marshal; + +import java.nio.ByteBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.StandardCharsets; + +import org.apache.cassandra.cql3.CQL3Type; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.Term; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.transport.ProtocolVersion; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.JsonUtils; + +public abstract class PseudoUtf8Type extends StringType +{ + PseudoUtf8Type() {super(ComparisonType.CUSTOM);} // singleton + + abstract String describe(); + + public ByteBuffer fromString(String source) + { + return decompose(source); + } + + @Override + public Term fromJSONObject(Object parsed) throws MarshalException + { + try + { + return new Constants.Value(fromString((String) parsed)); + } + catch (ClassCastException exc) + { + throw new MarshalException(String.format( + "Expected a %s string, but got a %s: %s", describe(), parsed.getClass().getSimpleName(), parsed)); + } + } + + @Override + public String toJSONString(ByteBuffer buffer, ProtocolVersion protocolVersion) + { + try + { + return '"' + JsonUtils.quoteAsJsonString(ByteBufferUtil.string(buffer, StandardCharsets.UTF_8)) + '"'; + } + catch (CharacterCodingException exc) + { + throw new AssertionError(describe() + " value contained non-utf8 characters: ", exc); + } + } + + @Override + public boolean isCompatibleWith(AbstractType<?> previous) + { + // Anything that is ascii is also utf8, and they both use bytes Review Comment: nit: probably can do without a line break ########## src/java/org/apache/cassandra/db/virtual/AccordDebugKeyspace.java: ########## @@ -297,12 +293,11 @@ private MaxConflictsTable() "CREATE TABLE %s (\n" + " keyspace_name text,\n" + " table_name text,\n" + - " token_sort blob,\n" + - " token_start text,\n" + - " token_end text,\n" + " command_store_id bigint,\n" + + " token_start 'TokenUtf8Type',\n" + Review Comment: Nit: is it possible to give it an alias? like token_string or something similar? ########## src/java/org/apache/cassandra/db/marshal/TxnIdUtf8Type.java: ########## @@ -0,0 +1,78 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db.marshal; + +import java.nio.ByteBuffer; + +import accord.primitives.TxnId; +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.serializers.UTF8Serializer; +import org.apache.cassandra.utils.ByteBufferUtil; + +public class TxnIdUtf8Type extends PseudoUtf8Type +{ + public static final TxnIdUtf8Type instance = new TxnIdUtf8Type(); + static final TypeSerializer<String> txnIdSerializer = new UTF8Serializer() + { + @Override + public <V> void validate(V value, ValueAccessor<V> accessor) throws MarshalException + { + super.validate(value, accessor); + String str = deserialize(value, accessor); + if (null == TxnId.tryParse(str)) Review Comment: should we use `parse` that throws ILE instead? ########## src/java/org/apache/cassandra/db/marshal/TokenUtf8Type.java: ########## @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db.marshal; + +import java.nio.ByteBuffer; + +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.serializers.UTF8Serializer; +import org.apache.cassandra.utils.ByteBufferUtil; + +import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; + +public class TokenUtf8Type extends PseudoUtf8Type +{ + public static final TokenUtf8Type instance = new TokenUtf8Type(); + static final TypeSerializer<String> txnIdSerializer = new UTF8Serializer() + { + @Override + public <V> void validate(V value, ValueAccessor<V> accessor) throws MarshalException + { + super.validate(value, accessor); + String str = deserialize(value, accessor); + if (null == getPartitioner().getTokenFactory().fromString(str)) + throw new MarshalException("Invalid Token: " + str); + } + }; + + private static final ArgumentDeserializer ARGUMENT_DESERIALIZER = new DefaultArgumentDeserializer(instance); + private static final ByteBuffer MASKED_VALUE = ByteBufferUtil.EMPTY_BYTE_BUFFER; + + TokenUtf8Type() {} // singleton Review Comment: Should we make implicit super call explicit here? ########## src/java/org/apache/cassandra/db/marshal/TokenUtf8Type.java: ########## @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.db.marshal; + +import java.nio.ByteBuffer; + +import org.apache.cassandra.cql3.functions.ArgumentDeserializer; +import org.apache.cassandra.dht.Token; +import org.apache.cassandra.serializers.MarshalException; +import org.apache.cassandra.serializers.TypeSerializer; +import org.apache.cassandra.serializers.UTF8Serializer; +import org.apache.cassandra.utils.ByteBufferUtil; + +import static org.apache.cassandra.config.DatabaseDescriptor.getPartitioner; + +public class TokenUtf8Type extends PseudoUtf8Type +{ + public static final TokenUtf8Type instance = new TokenUtf8Type(); + static final TypeSerializer<String> txnIdSerializer = new UTF8Serializer() Review Comment: nit: tokenSerializer? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: pr-unsubscr...@cassandra.apache.org For additional commands, e-mail: pr-h...@cassandra.apache.org
