blerer commented on a change in pull request #832:
URL: https://github.com/apache/cassandra/pull/832#discussion_r531028541



##########
File path: 
src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
##########
@@ -506,7 +506,8 @@ public void awaitTermination() throws InterruptedException
         for (CommitLogSegment segment : activeSegments)
             segment.close();
 
-        bufferPool.emptyBufferPool();
+        if (bufferPool != null)
+            bufferPool.emptyBufferPool();

Review comment:
       I have not checked if `org.apache.cassandra.streaming.LongStreamingTest` 
also fail in 3.11 but we should probably backport that fix anyway.

##########
File path: test/long/org/apache/cassandra/hints/HintsWriteThenReadTest.java
##########
@@ -129,10 +130,10 @@ private void verifyHints(File directory, HintsDescriptor 
descriptor)
 
                     Row row = 
mutation.getPartitionUpdates().iterator().next().iterator().next();
                     assertEquals(1, Iterables.size(row.cells()));
-                    assertEquals(bytes(index), row.clustering().get(0));
+                    assertTrue(Arrays.equals(bytes(index).array(), (byte[]) 
row.clustering().get(0)));

Review comment:
       This test was broken by the changes in CASSANDRA-15393 which introduced 
the `ArrayClustering` type .
   If for some reason we switch to another Clustering that use ByteBuffers the 
test will fail again.
   Should we not use  something like:
   
   ```
   assertEquals(bytes(index), toByteBuffer(row.clustering().get(0)));
   ...
   private ByteBuffer toByteBuffer(Object obj)
   {
       if (obj instanceof ByteBuffer)
          return (ByteBuffer) obj;
   
       return ByteBuffer.wrap((byte[]) obj);
   }
   ```
   




----------------------------------------------------------------
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.

For queries about this service, please contact Infrastructure at:
[email protected]



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to