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

Merge branch 'cassandra-4.0' into cassandra-4.1

This commit is contained in:
Brandon Williams 2023-10-30 08:15:41 -05:00
parent d3cc2a65b8 9697be1131
commit d5b6331d6e
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java
View File

@ -42,7 +42,7 @@ public class RowUtil
if (res != null && res.kind == ResultMessage.Kind.ROWS)
{
ResultMessage.Rows rows = (ResultMessage.Rows) res;
String[] names = getColumnNames(rows.result.metadata.names);
String[] names = getColumnNames(rows.result.metadata.requestNames());
Object[][] results = toObjects(rows);
// Warnings may be null here, due to ClientWarn#getWarnings() handling of empty warning lists.
@ -69,7 +69,7 @@ public class RowUtil
public static Object[][] toObjects(ResultMessage.Rows rows)
{
return toObjects(rows.result.metadata.names, rows.result.rows);
return toObjects(rows.result.metadata.requestNames(), rows.result.rows);
}
public static Object[][] toObjects(List<ColumnSpecification> specs, List<List<ByteBuffer>> rows)
@ -78,8 +78,8 @@ public class RowUtil
for (int i = 0; i < rows.size(); i++)
{
List<ByteBuffer> row = rows.get(i);
result[i] = new Object[row.size()];
for (int j = 0; j < row.size(); j++)
result[i] = new Object[specs.size()];
for (int j = 0; j < specs.size(); j++)
{
ByteBuffer bb = row.get(j);

46
test/distributed/org/apache/cassandra/distributed/test/DistributedRowUtilTest.java Normal file
View File

@ -0,0 +1,46 @@
/*
* 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;
import java.io.IOException;
import org.junit.Test;
import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
import static org.apache.cassandra.distributed.shared.AssertUtils.row;
public class DistributedRowUtilTest extends TestBaseImpl
{
@Test
public void correctColumnsReturnedForOrderedResults() throws IOException
{
try (Cluster cluster = init(Cluster.build(1).start()))
{
cluster.schemaChange(withKeyspace("CREATE TABLE %s.t (k int, c int, v int, primary key(k, c))"));
cluster.coordinator(1).execute(withKeyspace("INSERT INTO %s.t (k, c, v) VALUES (0, 1, 2)"), ConsistencyLevel.QUORUM);
String query = withKeyspace("SELECT v FROM %s.t WHERE k IN (0, 1) ORDER BY c LIMIT 10");
assertRows(cluster.coordinator(1).execute(query, ConsistencyLevel.QUORUM), row(2));
}
}
}