You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2017/08/30 17:06:53 UTC
[1/6] cassandra git commit: Remove unnecessary ReadCommand.index()
method (follow-up to CASSANDRA-13363)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 7f297bcf8 -> ded663622
refs/heads/cassandra-3.11 7ad1945ee -> 02e9846f1
refs/heads/trunk 3e4d000c9 -> c84269a39
Remove unnecessary ReadCommand.index() method (follow-up to
CASSANDRA-13363)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ded66362
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ded66362
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ded66362
Branch: refs/heads/cassandra-3.0
Commit: ded663622e7861d577bd8ab11ba5e502f57ce038
Parents: 7f297bc
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:00:38 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:00:38 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 66985b6..6a21bb3 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -297,19 +297,6 @@ public abstract class ReadCommand implements ReadQuery
}
/**
- * Index instance chosen for this query. Can be null.
- *
- * @return Index instance chosen for this query. Can be null.
- */
- @Nullable
- public Index index()
- {
- return null == index
- ? null
- : Keyspace.openAndGetStore(metadata).indexManager.getIndex(index);
- }
-
- /**
* The clustering index filter this command to use for the provided key.
* <p>
* Note that that method should only be called on a key actually queried by this command
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index 2457c4a..adcb68b 100644
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@ -118,7 +118,7 @@ public class SecondaryIndexTest
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup))
{
assertTrue(pi.hasNext());
@@ -204,7 +204,7 @@ public class SecondaryIndexTest
// verify that it's not being indexed under any other value either
ReadCommand rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// resurrect w/ a newer timestamp
new RowUpdateBuilder(cfs.metadata, 2, "k1").clustering("c").add("birthdate", 1L).build().apply();;
@@ -222,13 +222,13 @@ public class SecondaryIndexTest
// todo - checking the # of index searchers for the command is probably not the best thing to test here
RowUpdateBuilder.deleteRow(cfs.metadata, 3, "k1", "c").applyUnsafe();
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// make sure obsolete mutations don't generate an index entry
// todo - checking the # of index searchers for the command is probably not the best thing to test here
new RowUpdateBuilder(cfs.metadata, 3, "k1").clustering("c").add("birthdate", 1L).build().apply();;
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
}
@Test
@@ -504,7 +504,7 @@ public class SecondaryIndexTest
ColumnDefinition cdef = cfs.metadata.getColumnDefinition(col);
ReadCommand rc = Util.cmd(cfs).filterOn(cdef.name.toString(), Operator.EQ, ((AbstractType) cdef.cellValueType()).decompose(val)).build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
if (count != 0)
assertNotNull(searcher);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index c2598ec..8eefd29 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -604,7 +604,7 @@ public class SSTableReaderTest
.columns("birthdate")
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc);
assertNotNull(searcher);
try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Remove unnecessary ReadCommand.index()
method (follow-up to CASSANDRA-13363)
Posted by al...@apache.org.
Remove unnecessary ReadCommand.index() method (follow-up to
CASSANDRA-13363)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ded66362
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ded66362
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ded66362
Branch: refs/heads/trunk
Commit: ded663622e7861d577bd8ab11ba5e502f57ce038
Parents: 7f297bc
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:00:38 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:00:38 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 66985b6..6a21bb3 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -297,19 +297,6 @@ public abstract class ReadCommand implements ReadQuery
}
/**
- * Index instance chosen for this query. Can be null.
- *
- * @return Index instance chosen for this query. Can be null.
- */
- @Nullable
- public Index index()
- {
- return null == index
- ? null
- : Keyspace.openAndGetStore(metadata).indexManager.getIndex(index);
- }
-
- /**
* The clustering index filter this command to use for the provided key.
* <p>
* Note that that method should only be called on a key actually queried by this command
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index 2457c4a..adcb68b 100644
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@ -118,7 +118,7 @@ public class SecondaryIndexTest
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup))
{
assertTrue(pi.hasNext());
@@ -204,7 +204,7 @@ public class SecondaryIndexTest
// verify that it's not being indexed under any other value either
ReadCommand rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// resurrect w/ a newer timestamp
new RowUpdateBuilder(cfs.metadata, 2, "k1").clustering("c").add("birthdate", 1L).build().apply();;
@@ -222,13 +222,13 @@ public class SecondaryIndexTest
// todo - checking the # of index searchers for the command is probably not the best thing to test here
RowUpdateBuilder.deleteRow(cfs.metadata, 3, "k1", "c").applyUnsafe();
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// make sure obsolete mutations don't generate an index entry
// todo - checking the # of index searchers for the command is probably not the best thing to test here
new RowUpdateBuilder(cfs.metadata, 3, "k1").clustering("c").add("birthdate", 1L).build().apply();;
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
}
@Test
@@ -504,7 +504,7 @@ public class SecondaryIndexTest
ColumnDefinition cdef = cfs.metadata.getColumnDefinition(col);
ReadCommand rc = Util.cmd(cfs).filterOn(cdef.name.toString(), Operator.EQ, ((AbstractType) cdef.cellValueType()).decompose(val)).build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
if (count != 0)
assertNotNull(searcher);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index c2598ec..8eefd29 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -604,7 +604,7 @@ public class SSTableReaderTest
.columns("birthdate")
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc);
assertNotNull(searcher);
try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Remove unnecessary ReadCommand.index()
method (follow-up to CASSANDRA-13363)
Posted by al...@apache.org.
Remove unnecessary ReadCommand.index() method (follow-up to
CASSANDRA-13363)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ded66362
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ded66362
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ded66362
Branch: refs/heads/cassandra-3.11
Commit: ded663622e7861d577bd8ab11ba5e502f57ce038
Parents: 7f297bc
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:00:38 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:00:38 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 66985b6..6a21bb3 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -297,19 +297,6 @@ public abstract class ReadCommand implements ReadQuery
}
/**
- * Index instance chosen for this query. Can be null.
- *
- * @return Index instance chosen for this query. Can be null.
- */
- @Nullable
- public Index index()
- {
- return null == index
- ? null
- : Keyspace.openAndGetStore(metadata).indexManager.getIndex(index);
- }
-
- /**
* The clustering index filter this command to use for the provided key.
* <p>
* Note that that method should only be called on a key actually queried by this command
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index 2457c4a..adcb68b 100644
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@ -118,7 +118,7 @@ public class SecondaryIndexTest
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup))
{
assertTrue(pi.hasNext());
@@ -204,7 +204,7 @@ public class SecondaryIndexTest
// verify that it's not being indexed under any other value either
ReadCommand rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// resurrect w/ a newer timestamp
new RowUpdateBuilder(cfs.metadata, 2, "k1").clustering("c").add("birthdate", 1L).build().apply();;
@@ -222,13 +222,13 @@ public class SecondaryIndexTest
// todo - checking the # of index searchers for the command is probably not the best thing to test here
RowUpdateBuilder.deleteRow(cfs.metadata, 3, "k1", "c").applyUnsafe();
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// make sure obsolete mutations don't generate an index entry
// todo - checking the # of index searchers for the command is probably not the best thing to test here
new RowUpdateBuilder(cfs.metadata, 3, "k1").clustering("c").add("birthdate", 1L).build().apply();;
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
}
@Test
@@ -504,7 +504,7 @@ public class SecondaryIndexTest
ColumnDefinition cdef = cfs.metadata.getColumnDefinition(col);
ReadCommand rc = Util.cmd(cfs).filterOn(cdef.name.toString(), Operator.EQ, ((AbstractType) cdef.cellValueType()).decompose(val)).build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
if (count != 0)
assertNotNull(searcher);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ded66362/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index c2598ec..8eefd29 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@ -604,7 +604,7 @@ public class SSTableReaderTest
.columns("birthdate")
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc);
assertNotNull(searcher);
try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c84269a3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c84269a3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c84269a3
Branch: refs/heads/trunk
Commit: c84269a3919109a0a4b899c79b91842de5c1be8b
Parents: 3e4d000 02e9846
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:05:30 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:05:30 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index df5e7ce,33a5fb6..38b0a39
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@@ -204,10 -202,10 +204,10 @@@ public class SecondaryIndexTes
// verify that it's not being indexed under any other value either
ReadCommand rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// resurrect w/ a newer timestamp
- new RowUpdateBuilder(cfs.metadata, 2, "k1").clustering("c").add("birthdate", 1L).build().apply();;
+ new RowUpdateBuilder(cfs.metadata(), 2, "k1").clustering("c").add("birthdate", 1L).build().apply();;
assertIndexedOne(cfs, col, 1L);
// verify that row and delete w/ older timestamp does nothing
@@@ -220,15 -218,15 +220,15 @@@
// delete the entire row (w/ newer timestamp this time)
// todo - checking the # of index searchers for the command is probably not the best thing to test here
- RowUpdateBuilder.deleteRow(cfs.metadata, 3, "k1", "c").applyUnsafe();
+ RowUpdateBuilder.deleteRow(cfs.metadata(), 3, "k1", "c").applyUnsafe();
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
// make sure obsolete mutations don't generate an index entry
// todo - checking the # of index searchers for the command is probably not the best thing to test here
- new RowUpdateBuilder(cfs.metadata, 3, "k1").clustering("c").add("birthdate", 1L).build().apply();;
+ new RowUpdateBuilder(cfs.metadata(), 3, "k1").clustering("c").add("birthdate", 1L).build().apply();;
rc = Util.cmd(cfs).build();
- assertNull(rc.index());
+ assertNull(rc.getIndex(cfs));
}
@Test
@@@ -533,10 -520,10 +533,10 @@@
}
private void assertIndexedCount(ColumnFamilyStore cfs, ByteBuffer col, Object val, int count)
{
- ColumnDefinition cdef = cfs.metadata.getColumnDefinition(col);
+ ColumnMetadata cdef = cfs.metadata().getColumn(col);
ReadCommand rc = Util.cmd(cfs).filterOn(cdef.name.toString(), Operator.EQ, ((AbstractType) cdef.cellValueType()).decompose(val)).build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
if (count != 0)
assertNotNull(searcher);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c84269a3/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02e9846f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02e9846f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02e9846f
Branch: refs/heads/cassandra-3.11
Commit: 02e9846f1ab81d5533d1c9951b3de4855ca890c5
Parents: 7ad1945 ded6636
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:05:09 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:05:09 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index f2100db,adcb68b..33a5fb6
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@@ -115,9 -118,8 +115,9 @@@ public class SecondaryIndexTes
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
- try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup))
+ try (ReadExecutionController executionController = rc.executionController();
+ UnfilteredPartitionIterator pi = searcher.search(executionController))
{
assertTrue(pi.hasNext());
pi.next().close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 5a8cf67,8eefd29..3d11c18
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@@ -595,11 -604,11 +595,11 @@@ public class SSTableReaderTes
.columns("birthdate")
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc);
assertNotNull(searcher);
- try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc))
+ try (ReadExecutionController executionController = rc.executionController())
{
- assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(orderGroup), rc.nowInSec())));
+ assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(executionController), rc.nowInSec())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02e9846f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02e9846f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02e9846f
Branch: refs/heads/trunk
Commit: 02e9846f1ab81d5533d1c9951b3de4855ca890c5
Parents: 7ad1945 ded6636
Author: Aleksey Yeschenko <al...@yeschenko.com>
Authored: Wed Aug 30 18:05:09 2017 +0100
Committer: Aleksey Yeschenko <al...@yeschenko.com>
Committed: Wed Aug 30 18:05:09 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 13 -------------
.../org/apache/cassandra/db/SecondaryIndexTest.java | 10 +++++-----
.../apache/cassandra/io/sstable/SSTableReaderTest.java | 2 +-
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
index f2100db,adcb68b..33a5fb6
--- a/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
+++ b/test/unit/org/apache/cassandra/db/SecondaryIndexTest.java
@@@ -115,9 -118,8 +115,9 @@@ public class SecondaryIndexTes
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(cfs).searcherFor(rc);
- try (ReadOrderGroup orderGroup = rc.startOrderGroup(); UnfilteredPartitionIterator pi = searcher.search(orderGroup))
+ try (ReadExecutionController executionController = rc.executionController();
+ UnfilteredPartitionIterator pi = searcher.search(executionController))
{
assertTrue(pi.hasNext());
pi.next().close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/02e9846f/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 5a8cf67,8eefd29..3d11c18
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@@ -595,11 -604,11 +595,11 @@@ public class SSTableReaderTes
.columns("birthdate")
.filterOn("birthdate", Operator.EQ, 1L)
.build();
- Index.Searcher searcher = rc.index().searcherFor(rc);
+ Index.Searcher searcher = rc.getIndex(indexedCFS).searcherFor(rc);
assertNotNull(searcher);
- try (ReadOrderGroup orderGroup = ReadOrderGroup.forCommand(rc))
+ try (ReadExecutionController executionController = rc.executionController())
{
- assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(orderGroup), rc.nowInSec())));
+ assertEquals(1, Util.size(UnfilteredPartitionIterators.filter(searcher.search(executionController), rc.nowInSec())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org