This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 9697be1131 Fix dtests returning ordering columns that have not been
selected
9697be1131 is described below
commit 9697be1131bd8bb2332199000ad55dad12524fd2
Author: Mike Adamson <[email protected]>
AuthorDate: Thu Sep 28 16:54:31 2023 +0100
Fix dtests returning ordering columns that have not been selected
patch by Mike Adamson; reviewed by adelapena, brandonwilliams and
Jeremiah Jordan for CASSANDRA-18892
---
.../apache/cassandra/distributed/impl/RowUtil.java | 8 ++--
.../distributed/test/DistributedRowUtilTest.java | 46 ++++++++++++++++++++++
2 files changed, 50 insertions(+), 4 deletions(-)
diff --git
a/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java
b/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java
index ca266393ad..6855ac9853 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/RowUtil.java
@@ -43,7 +43,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.
@@ -70,7 +70,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)
@@ -79,8 +79,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);
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/DistributedRowUtilTest.java
b/test/distributed/org/apache/cassandra/distributed/test/DistributedRowUtilTest.java
new file mode 100644
index 0000000000..d21ac19e61
--- /dev/null
+++
b/test/distributed/org/apache/cassandra/distributed/test/DistributedRowUtilTest.java
@@ -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));
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
