You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pr@cassandra.apache.org by "adelapena (via GitHub)" <gi...@apache.org> on 2023/06/26 11:50:51 UTC
[GitHub] [cassandra] adelapena commented on a diff in pull request #2420: Stream all components registered by an sstable
adelapena commented on code in PR #2420:
URL: https://github.com/apache/cassandra/pull/2420#discussion_r1242034910
##########
src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java:
##########
@@ -82,9 +82,9 @@ public static class Components extends SSTableFormat.Components
public static class Types extends SSTableFormat.Components.Types
{
// index of the row keys with pointers to their positions in the data file
- public static final Component.Type PRIMARY_INDEX = Component.Type.createSingleton("PRIMARY_INDEX", "Index.db", BigFormat.class);
+ public static final Component.Type PRIMARY_INDEX = Component.Type.createSingleton("PRIMARY_INDEX", "Index.db", true, BigFormat.class);
Review Comment:
We'll need to update [the doc on `SSTable_API.md`](https://github.com/apache/cassandra/blob/cep-7-sai/src/java/org/apache/cassandra/io/sstable/SSTable_API.md#components) to include the new `streamable` parameter.
##########
src/java/org/apache/cassandra/io/sstable/Component.java:
##########
@@ -60,31 +61,34 @@ public final static class Type
/**
* Creates a new non-singleton type and registers it a global type registry - see {@link #registerType(Type)}.
*
- * @param name type name, must be unique for this and all parent formats
- * @param repr the regular expression to be used to recognize a name represents this type
- * @param formatClass format class for which this type is defined for
+ * @param name type name, must be unique for this and all parent formats
+ * @param repr the regular expression to be used to recognize a name represents this type
+ * @param isStreamable whether components of this type should be streamed to other nodes
+ * @param formatClass format class for which this type is defined for
*/
- public static Type create(String name, String repr, Class<? extends SSTableFormat<?, ?>> formatClass)
+ public static Type create(String name, String repr, boolean isStreamable, Class<? extends SSTableFormat<?, ?>> formatClass)
{
- return new Type(name, repr, false, formatClass);
+ return new Type(name, repr, false, isStreamable, formatClass);
}
/**
* Creates a new singleton type and registers it in a global type registry - see {@link #registerType(Type)}.
*
- * @param name type name, must be unique for this and all parent formats
- * @param repr the regular expression to be used to recognize a name represents this type
- * @param formatClass format class for which this type is defined for
+ * @param name type name, must be unique for this and all parent formats
+ * @param repr the regular expression to be used to recognize a name represents this type
+ * @param isStreamable whether components of this type should be streamed to other nodes
+ * @param formatClass format class for which this type is defined for
*/
- public static Type createSingleton(String name, String repr, Class<? extends SSTableFormat<?, ?>> formatClass)
+ public static Type createSingleton(String name, String repr, boolean isStreamable, Class<? extends SSTableFormat<?, ?>> formatClass)
Review Comment:
Nit: the parameter could be named `streamable` for consistency with the attribute and constructor names.
##########
src/java/org/apache/cassandra/io/sstable/Component.java:
##########
@@ -60,31 +61,34 @@ public final static class Type
/**
* Creates a new non-singleton type and registers it a global type registry - see {@link #registerType(Type)}.
*
- * @param name type name, must be unique for this and all parent formats
- * @param repr the regular expression to be used to recognize a name represents this type
- * @param formatClass format class for which this type is defined for
+ * @param name type name, must be unique for this and all parent formats
+ * @param repr the regular expression to be used to recognize a name represents this type
+ * @param isStreamable whether components of this type should be streamed to other nodes
+ * @param formatClass format class for which this type is defined for
*/
- public static Type create(String name, String repr, Class<? extends SSTableFormat<?, ?>> formatClass)
+ public static Type create(String name, String repr, boolean isStreamable, Class<? extends SSTableFormat<?, ?>> formatClass)
{
- return new Type(name, repr, false, formatClass);
+ return new Type(name, repr, false, isStreamable, formatClass);
Review Comment:
Nit: the parameter could be named `streamable` for consistency with the attribute and constructor names.
##########
test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.distributed.test.sai;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.Row;
+import org.apache.cassandra.distributed.api.SimpleQueryResult;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.distributed.util.QueryResultUtil;
+import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat;
+import org.assertj.core.api.Assertions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexStreamingTest extends TestBaseImpl
+{
+ private static final ByteBuffer BLOB = ByteBuffer.wrap(new byte[1 << 16]);
+ private static final int NUM_COMPONENTS;
+
+ static
+ {
+ DatabaseDescriptor.clientInitialization();
+ NUM_COMPONENTS = sstableStreamingComponentsCount()
+ + V1OnDiskFormat.PER_SSTABLE_COMPONENTS.size()
+ + V1OnDiskFormat.LITERAL_COMPONENTS.size();
+ }
+
+ private static int sstableStreamingComponentsCount() {
+ return (int) DatabaseDescriptor.getSelectedSSTableFormat()
+ .allComponents()
+ .stream()
+ .filter(c -> c.type.streamable)
+ .count() - 1; // -1 because we don't include the compression component
+ }
+
+ @Test
+ public void zeroCopy() throws IOException
+ {
+ test(true);
+ }
+
+ @Test
+ public void notZeroCopy() throws IOException
+ {
+ test(false);
+ }
+
+ private void test(boolean zeroCopyStreaming) throws IOException
+ {
+ try (Cluster cluster = init(Cluster.build(2)
+ .withConfig(c -> c.with(Feature.values())
+ .set("stream_entire_sstables", zeroCopyStreaming).set("streaming_slow_events_log_timeout", "0s"))
+ .start()))
+ {
+ // streaming sends events every 65k, so need to make sure that the files are larger than this to hit
+ // all cases of the vtable
+ cluster.schemaChange(withKeyspace(
+ "CREATE TABLE %s.test (pk int PRIMARY KEY, v text, b blob) WITH compression = { 'enabled' : false };"
+ ));
+ cluster.schemaChange(withKeyspace(
+ "CREATE CUSTOM INDEX ON %s.test(v) USING 'StorageAttachedIndex';"
+ ));
+ cluster.stream().forEach(i ->
+ i.nodetoolResult("disableautocompaction", KEYSPACE).asserts().success()
+ );
+ IInvokableInstance first = cluster.get(1);
+ IInvokableInstance second = cluster.get(2);
+ long sstableCount = 10;
+ long expectedFiles = zeroCopyStreaming ? sstableCount * NUM_COMPONENTS : sstableCount;
+ for (int i = 0; i < sstableCount; i++)
+ {
+ first.executeInternal(withKeyspace("insert into %s.test(pk, v, b) values (?, ?, ?)"), i, "v" + i, BLOB);
+ first.flush(KEYSPACE);
+ }
+
+ second.nodetoolResult("rebuild", "--keyspace", KEYSPACE).asserts().success();
+
+ SimpleQueryResult qr = first.executeInternalWithResult("SELECT * FROM system_views.streaming");
+ String txt = QueryResultUtil.expand(qr);
+ qr.reset();
+ assertThat(qr.toObjectArrays().length).describedAs("Found rows\n%s", txt).isEqualTo(1);
+ assertThat(qr.hasNext()).isTrue();
+ Row row = qr.next();
+ QueryResultUtil.assertThat(row)
+ .isEqualTo("peers", Collections.singletonList("/127.0.0.2:7012"))
Review Comment:
```suggestion
.isEqualTo("peers", Collections.singletonList(second.broadcastAddress().toString()))
```
##########
src/java/org/apache/cassandra/io/sstable/SSTableZeroCopyWriter.java:
##########
@@ -195,14 +197,15 @@ public void close()
writer.close();
}
- public void writeComponent(Component.Type type, DataInputPlus in, long size) throws ClosedChannelException
+ public void writeComponent(Component component, DataInputPlus in, long size) throws ClosedChannelException
{
- logger.info("Writing component {} to {} length {}", type, componentWriters.get(type).getPath(), prettyPrintMemory(size));
+ SequentialWriter writer = componentWriters.get(component.name);
Review Comment:
Build fails here with `eclipse-warnings` saying `Potential resource leak: 'writer' may not be closed`
##########
test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.distributed.test.sai;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.Row;
+import org.apache.cassandra.distributed.api.SimpleQueryResult;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.distributed.util.QueryResultUtil;
+import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat;
+import org.assertj.core.api.Assertions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexStreamingTest extends TestBaseImpl
+{
+ private static final ByteBuffer BLOB = ByteBuffer.wrap(new byte[1 << 16]);
+ private static final int NUM_COMPONENTS;
+
+ static
+ {
+ DatabaseDescriptor.clientInitialization();
+ NUM_COMPONENTS = sstableStreamingComponentsCount()
+ + V1OnDiskFormat.PER_SSTABLE_COMPONENTS.size()
+ + V1OnDiskFormat.LITERAL_COMPONENTS.size();
+ }
+
+ private static int sstableStreamingComponentsCount() {
+ return (int) DatabaseDescriptor.getSelectedSSTableFormat()
+ .allComponents()
+ .stream()
+ .filter(c -> c.type.streamable)
+ .count() - 1; // -1 because we don't include the compression component
+ }
+
+ @Test
+ public void zeroCopy() throws IOException
+ {
+ test(true);
+ }
+
+ @Test
+ public void notZeroCopy() throws IOException
+ {
+ test(false);
+ }
+
+ private void test(boolean zeroCopyStreaming) throws IOException
+ {
+ try (Cluster cluster = init(Cluster.build(2)
+ .withConfig(c -> c.with(Feature.values())
+ .set("stream_entire_sstables", zeroCopyStreaming).set("streaming_slow_events_log_timeout", "0s"))
+ .start()))
+ {
+ // streaming sends events every 65k, so need to make sure that the files are larger than this to hit
+ // all cases of the vtable
+ cluster.schemaChange(withKeyspace(
+ "CREATE TABLE %s.test (pk int PRIMARY KEY, v text, b blob) WITH compression = { 'enabled' : false };"
+ ));
+ cluster.schemaChange(withKeyspace(
+ "CREATE CUSTOM INDEX ON %s.test(v) USING 'StorageAttachedIndex';"
+ ));
+ cluster.stream().forEach(i ->
+ i.nodetoolResult("disableautocompaction", KEYSPACE).asserts().success()
+ );
+ IInvokableInstance first = cluster.get(1);
+ IInvokableInstance second = cluster.get(2);
+ long sstableCount = 10;
+ long expectedFiles = zeroCopyStreaming ? sstableCount * NUM_COMPONENTS : sstableCount;
+ for (int i = 0; i < sstableCount; i++)
+ {
+ first.executeInternal(withKeyspace("insert into %s.test(pk, v, b) values (?, ?, ?)"), i, "v" + i, BLOB);
+ first.flush(KEYSPACE);
+ }
+
+ second.nodetoolResult("rebuild", "--keyspace", KEYSPACE).asserts().success();
+
+ SimpleQueryResult qr = first.executeInternalWithResult("SELECT * FROM system_views.streaming");
+ String txt = QueryResultUtil.expand(qr);
+ qr.reset();
+ assertThat(qr.toObjectArrays().length).describedAs("Found rows\n%s", txt).isEqualTo(1);
+ assertThat(qr.hasNext()).isTrue();
+ Row row = qr.next();
+ QueryResultUtil.assertThat(row)
+ .isEqualTo("peers", Collections.singletonList("/127.0.0.2:7012"))
+ .isEqualTo("follower", true)
+ .isEqualTo("operation", "Rebuild")
+ .isEqualTo("status", "success")
+ .isEqualTo("progress_percentage", 100.0F)
+ .isEqualTo("success_message", null).isEqualTo("failure_cause", null)
+ .isEqualTo("files_sent", expectedFiles)
+ .columnsEqualTo("files_sent", "files_to_send")
+ .columnsEqualTo("bytes_sent", "bytes_to_send")
+ .isEqualTo("files_received", 0L)
+ .columnsEqualTo("files_received", "files_to_receive", "bytes_received", "bytes_to_receive");
+ long totalBytes = row.getLong("bytes_sent");
+ assertThat(totalBytes).isGreaterThan(0);
+
+ qr = second.executeInternalWithResult("SELECT * FROM system_views.streaming");
+ txt = QueryResultUtil.expand(qr);
+ qr.reset();
+ assertThat(qr.toObjectArrays().length).describedAs("Found rows\n%s", txt).isEqualTo(1);
+ assertThat(qr.hasNext()).isTrue();
+
+ QueryResultUtil.assertThat(qr.next())
+ .isEqualTo("peers", Collections.singletonList("/127.0.0.1:7012"))
+ .isEqualTo("follower", false)
+ .isEqualTo("operation", "Rebuild")
+ .isEqualTo("status", "success")
+ .isEqualTo("progress_percentage", 100.0F)
+ .isEqualTo("success_message", null).isEqualTo("failure_cause", null)
+ .columnsEqualTo("files_to_receive", "files_received").isEqualTo("files_received", expectedFiles)
+ .columnsEqualTo("bytes_to_receive", "bytes_received").isEqualTo("bytes_received", totalBytes)
+ .columnsEqualTo("files_sent", "files_to_send", "bytes_sent", "bytes_to_send").isEqualTo("files_sent", 0L);
+
+ // did we trigger slow event log?
+ cluster.forEach(i -> Assertions.assertThat(i.logs().grep("Handling streaming events took longer than").getResult()).describedAs("Unable to find slow log for node%d", i.config().num()).isNotEmpty());
Review Comment:
Nit: break the long line
```suggestion
cluster.forEach(i -> Assertions.assertThat(i.logs().grep("Handling streaming events took longer than").getResult())
.describedAs("Unable to find slow log for node%d", i.config().num())
.isNotEmpty());
```
##########
test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.distributed.test.sai;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.Row;
+import org.apache.cassandra.distributed.api.SimpleQueryResult;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.distributed.util.QueryResultUtil;
+import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat;
+import org.assertj.core.api.Assertions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexStreamingTest extends TestBaseImpl
+{
+ private static final ByteBuffer BLOB = ByteBuffer.wrap(new byte[1 << 16]);
+ private static final int NUM_COMPONENTS;
+
+ static
+ {
+ DatabaseDescriptor.clientInitialization();
+ NUM_COMPONENTS = sstableStreamingComponentsCount()
+ + V1OnDiskFormat.PER_SSTABLE_COMPONENTS.size()
+ + V1OnDiskFormat.LITERAL_COMPONENTS.size();
+ }
+
+ private static int sstableStreamingComponentsCount() {
+ return (int) DatabaseDescriptor.getSelectedSSTableFormat()
+ .allComponents()
+ .stream()
+ .filter(c -> c.type.streamable)
+ .count() - 1; // -1 because we don't include the compression component
+ }
+
+ @Test
+ public void zeroCopy() throws IOException
+ {
+ test(true);
+ }
+
+ @Test
+ public void notZeroCopy() throws IOException
+ {
+ test(false);
+ }
+
+ private void test(boolean zeroCopyStreaming) throws IOException
+ {
+ try (Cluster cluster = init(Cluster.build(2)
+ .withConfig(c -> c.with(Feature.values())
+ .set("stream_entire_sstables", zeroCopyStreaming).set("streaming_slow_events_log_timeout", "0s"))
+ .start()))
+ {
+ // streaming sends events every 65k, so need to make sure that the files are larger than this to hit
+ // all cases of the vtable
Review Comment:
Maybe this comment would be better placed either right before the `INSERT` or when declaring the `BLOB` size.
##########
test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.distributed.test.sai;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.Row;
+import org.apache.cassandra.distributed.api.SimpleQueryResult;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.distributed.util.QueryResultUtil;
+import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat;
+import org.assertj.core.api.Assertions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexStreamingTest extends TestBaseImpl
+{
+ private static final ByteBuffer BLOB = ByteBuffer.wrap(new byte[1 << 16]);
+ private static final int NUM_COMPONENTS;
+
+ static
+ {
+ DatabaseDescriptor.clientInitialization();
+ NUM_COMPONENTS = sstableStreamingComponentsCount()
+ + V1OnDiskFormat.PER_SSTABLE_COMPONENTS.size()
+ + V1OnDiskFormat.LITERAL_COMPONENTS.size();
+ }
+
+ private static int sstableStreamingComponentsCount() {
+ return (int) DatabaseDescriptor.getSelectedSSTableFormat()
+ .allComponents()
+ .stream()
+ .filter(c -> c.type.streamable)
+ .count() - 1; // -1 because we don't include the compression component
+ }
+
+ @Test
+ public void zeroCopy() throws IOException
+ {
+ test(true);
+ }
+
+ @Test
+ public void notZeroCopy() throws IOException
+ {
+ test(false);
+ }
+
+ private void test(boolean zeroCopyStreaming) throws IOException
+ {
+ try (Cluster cluster = init(Cluster.build(2)
+ .withConfig(c -> c.with(Feature.values())
+ .set("stream_entire_sstables", zeroCopyStreaming).set("streaming_slow_events_log_timeout", "0s"))
Review Comment:
Nit: break the long line
```suggestion
.set("stream_entire_sstables", zeroCopyStreaming)
.set("streaming_slow_events_log_timeout", "0s"))
```
##########
test/distributed/org/apache/cassandra/distributed/test/sai/IndexStreamingTest.java:
##########
@@ -0,0 +1,151 @@
+/*
+ * 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.distributed.test.sai;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+
+import org.junit.Test;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.Row;
+import org.apache.cassandra.distributed.api.SimpleQueryResult;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.distributed.util.QueryResultUtil;
+import org.apache.cassandra.index.sai.disk.v1.V1OnDiskFormat;
+import org.assertj.core.api.Assertions;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class IndexStreamingTest extends TestBaseImpl
+{
+ private static final ByteBuffer BLOB = ByteBuffer.wrap(new byte[1 << 16]);
+ private static final int NUM_COMPONENTS;
+
+ static
+ {
+ DatabaseDescriptor.clientInitialization();
+ NUM_COMPONENTS = sstableStreamingComponentsCount()
+ + V1OnDiskFormat.PER_SSTABLE_COMPONENTS.size()
+ + V1OnDiskFormat.LITERAL_COMPONENTS.size();
+ }
+
+ private static int sstableStreamingComponentsCount() {
+ return (int) DatabaseDescriptor.getSelectedSSTableFormat()
+ .allComponents()
+ .stream()
+ .filter(c -> c.type.streamable)
+ .count() - 1; // -1 because we don't include the compression component
+ }
+
+ @Test
+ public void zeroCopy() throws IOException
+ {
+ test(true);
+ }
+
+ @Test
+ public void notZeroCopy() throws IOException
+ {
+ test(false);
+ }
+
+ private void test(boolean zeroCopyStreaming) throws IOException
+ {
+ try (Cluster cluster = init(Cluster.build(2)
+ .withConfig(c -> c.with(Feature.values())
+ .set("stream_entire_sstables", zeroCopyStreaming).set("streaming_slow_events_log_timeout", "0s"))
+ .start()))
+ {
+ // streaming sends events every 65k, so need to make sure that the files are larger than this to hit
+ // all cases of the vtable
+ cluster.schemaChange(withKeyspace(
+ "CREATE TABLE %s.test (pk int PRIMARY KEY, v text, b blob) WITH compression = { 'enabled' : false };"
+ ));
+ cluster.schemaChange(withKeyspace(
+ "CREATE CUSTOM INDEX ON %s.test(v) USING 'StorageAttachedIndex';"
+ ));
+ cluster.stream().forEach(i ->
+ i.nodetoolResult("disableautocompaction", KEYSPACE).asserts().success()
+ );
+ IInvokableInstance first = cluster.get(1);
+ IInvokableInstance second = cluster.get(2);
+ long sstableCount = 10;
+ long expectedFiles = zeroCopyStreaming ? sstableCount * NUM_COMPONENTS : sstableCount;
+ for (int i = 0; i < sstableCount; i++)
+ {
+ first.executeInternal(withKeyspace("insert into %s.test(pk, v, b) values (?, ?, ?)"), i, "v" + i, BLOB);
+ first.flush(KEYSPACE);
+ }
+
+ second.nodetoolResult("rebuild", "--keyspace", KEYSPACE).asserts().success();
+
+ SimpleQueryResult qr = first.executeInternalWithResult("SELECT * FROM system_views.streaming");
+ String txt = QueryResultUtil.expand(qr);
+ qr.reset();
+ assertThat(qr.toObjectArrays().length).describedAs("Found rows\n%s", txt).isEqualTo(1);
+ assertThat(qr.hasNext()).isTrue();
+ Row row = qr.next();
+ QueryResultUtil.assertThat(row)
+ .isEqualTo("peers", Collections.singletonList("/127.0.0.2:7012"))
+ .isEqualTo("follower", true)
+ .isEqualTo("operation", "Rebuild")
+ .isEqualTo("status", "success")
+ .isEqualTo("progress_percentage", 100.0F)
+ .isEqualTo("success_message", null).isEqualTo("failure_cause", null)
+ .isEqualTo("files_sent", expectedFiles)
+ .columnsEqualTo("files_sent", "files_to_send")
+ .columnsEqualTo("bytes_sent", "bytes_to_send")
+ .isEqualTo("files_received", 0L)
+ .columnsEqualTo("files_received", "files_to_receive", "bytes_received", "bytes_to_receive");
+ long totalBytes = row.getLong("bytes_sent");
+ assertThat(totalBytes).isGreaterThan(0);
+
+ qr = second.executeInternalWithResult("SELECT * FROM system_views.streaming");
+ txt = QueryResultUtil.expand(qr);
+ qr.reset();
+ assertThat(qr.toObjectArrays().length).describedAs("Found rows\n%s", txt).isEqualTo(1);
+ assertThat(qr.hasNext()).isTrue();
+
+ QueryResultUtil.assertThat(qr.next())
+ .isEqualTo("peers", Collections.singletonList("/127.0.0.1:7012"))
Review Comment:
```suggestion
.isEqualTo("peers", Collections.singletonList(first.broadcastAddress().toString()))
```
--
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-unsubscribe@cassandra.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org