Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 12DDF10C36 for ; Tue, 4 Nov 2014 16:32:25 +0000 (UTC) Received: (qmail 42171 invoked by uid 500); 4 Nov 2014 16:32:24 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 42123 invoked by uid 500); 4 Nov 2014 16:32:24 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 42093 invoked by uid 99); 4 Nov 2014 16:32:24 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Nov 2014 16:32:24 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 908898AE0A9; Tue, 4 Nov 2014 16:32:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Tue, 04 Nov 2014 16:32:25 -0000 Message-Id: <4a54459c2c274d5f8c3d411d1780cb6e@git.apache.org> In-Reply-To: <91924f960dcd45cfbbf46f8a2c95a6ae@git.apache.org> References: <91924f960dcd45cfbbf46f8a2c95a6ae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] Consolidate Relation.Type and IndexExpression.Operator http://git-wip-us.apache.org/repos/asf/cassandra/blob/5117a5d5/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java index 2071a33..205babc 100644 --- a/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java @@ -71,7 +71,7 @@ public class ColumnConditionTest ColumnDefinition definition = new ColumnDefinition("ks", "cf", new ColumnIdentifier("c", true), Int32Type.instance, null, null, null, null, null); // EQ - ColumnCondition condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.EQ); + ColumnCondition condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.EQ); ColumnCondition.Bound bound = condition.bind(QueryOptions.DEFAULT); assertTrue(isSatisfiedBy(bound, ONE, ONE)); assertFalse(isSatisfiedBy(bound, ZERO, ONE)); @@ -84,7 +84,7 @@ public class ColumnConditionTest assertFalse(isSatisfiedBy(bound, null, ONE)); // NEQ - condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.NEQ); + condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.NEQ); bound = condition.bind(QueryOptions.DEFAULT); assertFalse(isSatisfiedBy(bound, ONE, ONE)); assertTrue(isSatisfiedBy(bound, ZERO, ONE)); @@ -97,7 +97,7 @@ public class ColumnConditionTest assertTrue(isSatisfiedBy(bound, null, ONE)); // LT - condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.LT); + condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.LT); bound = condition.bind(QueryOptions.DEFAULT); assertFalse(isSatisfiedBy(bound, ONE, ONE)); assertFalse(isSatisfiedBy(bound, ZERO, ONE)); @@ -109,7 +109,7 @@ public class ColumnConditionTest assertFalse(isSatisfiedBy(bound, ONE, null)); // LTE - condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.LTE); + condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.LTE); bound = condition.bind(QueryOptions.DEFAULT); assertTrue(isSatisfiedBy(bound, ONE, ONE)); assertFalse(isSatisfiedBy(bound, ZERO, ONE)); @@ -121,7 +121,7 @@ public class ColumnConditionTest assertFalse(isSatisfiedBy(bound, ONE, null)); // GT - condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.GT); + condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.GT); bound = condition.bind(QueryOptions.DEFAULT); assertFalse(isSatisfiedBy(bound, ONE, ONE)); assertTrue(isSatisfiedBy(bound, ZERO, ONE)); @@ -133,7 +133,7 @@ public class ColumnConditionTest assertFalse(isSatisfiedBy(bound, ONE, null)); // GT - condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Relation.Type.GTE); + condition = ColumnCondition.condition(definition, new Constants.Value(ONE), Operator.GTE); bound = condition.bind(QueryOptions.DEFAULT); assertTrue(isSatisfiedBy(bound, ONE, ONE)); assertTrue(isSatisfiedBy(bound, ZERO, ONE)); @@ -179,7 +179,7 @@ public class ColumnConditionTest ColumnDefinition definition = new ColumnDefinition("ks", "cf", new ColumnIdentifier("c", true), ListType.getInstance(Int32Type.instance), null, null, null, null, null); // EQ - ColumnCondition condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.EQ); + ColumnCondition condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.EQ); ColumnCondition.CollectionBound bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(listAppliesTo(bound, list(ONE), list(ONE))); assertTrue(listAppliesTo(bound, list(), list())); @@ -195,7 +195,7 @@ public class ColumnConditionTest assertTrue(listAppliesTo(bound, list(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // NEQ - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.NEQ); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.NEQ); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(listAppliesTo(bound, list(ONE), list(ONE))); assertFalse(listAppliesTo(bound, list(), list())); @@ -211,7 +211,7 @@ public class ColumnConditionTest assertFalse(listAppliesTo(bound, list(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LT - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.LT); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.LT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(listAppliesTo(bound, list(ONE), list(ONE))); assertFalse(listAppliesTo(bound, list(), list())); @@ -227,7 +227,7 @@ public class ColumnConditionTest assertFalse(listAppliesTo(bound, list(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LTE - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.LTE); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.LTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(listAppliesTo(bound, list(ONE), list(ONE))); assertTrue(listAppliesTo(bound, list(), list())); @@ -243,7 +243,7 @@ public class ColumnConditionTest assertTrue(listAppliesTo(bound, list(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GT - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.GT); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.GT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(listAppliesTo(bound, list(ONE), list(ONE))); assertFalse(listAppliesTo(bound, list(), list())); @@ -259,7 +259,7 @@ public class ColumnConditionTest assertFalse(listAppliesTo(bound, list(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GTE - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.GTE); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.GTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(listAppliesTo(bound, list(ONE), list(ONE))); assertTrue(listAppliesTo(bound, list(), list())); @@ -309,7 +309,7 @@ public class ColumnConditionTest ColumnDefinition definition = new ColumnDefinition("ks", "cf", new ColumnIdentifier("c", true), SetType.getInstance(Int32Type.instance), null, null, null, null, null); // EQ - ColumnCondition condition = ColumnCondition.condition(definition, null, new Sets.Value(set(ONE)), Relation.Type.EQ); + ColumnCondition condition = ColumnCondition.condition(definition, null, new Sets.Value(set(ONE)), Operator.EQ); ColumnCondition.CollectionBound bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(setAppliesTo(bound, set(ONE), list(ONE))); assertTrue(setAppliesTo(bound, set(), list())); @@ -325,7 +325,7 @@ public class ColumnConditionTest assertTrue(setAppliesTo(bound, set(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // NEQ - condition = ColumnCondition.condition(definition, null, new Sets.Value(set(ONE)), Relation.Type.NEQ); + condition = ColumnCondition.condition(definition, null, new Sets.Value(set(ONE)), Operator.NEQ); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(setAppliesTo(bound, set(ONE), list(ONE))); assertFalse(setAppliesTo(bound, set(), list())); @@ -341,7 +341,7 @@ public class ColumnConditionTest assertFalse(setAppliesTo(bound, set(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LT - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.LT); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.LT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(setAppliesTo(bound, set(ONE), list(ONE))); assertFalse(setAppliesTo(bound, set(), list())); @@ -357,7 +357,7 @@ public class ColumnConditionTest assertFalse(setAppliesTo(bound, set(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LTE - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.LTE); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.LTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(setAppliesTo(bound, set(ONE), list(ONE))); assertTrue(setAppliesTo(bound, set(), list())); @@ -373,7 +373,7 @@ public class ColumnConditionTest assertTrue(setAppliesTo(bound, set(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GT - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.GT); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.GT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(setAppliesTo(bound, set(ONE), list(ONE))); assertFalse(setAppliesTo(bound, set(), list())); @@ -389,7 +389,7 @@ public class ColumnConditionTest assertFalse(setAppliesTo(bound, set(ByteBufferUtil.EMPTY_BYTE_BUFFER), list(ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GTE - condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Relation.Type.GTE); + condition = ColumnCondition.condition(definition, null, new Lists.Value(Arrays.asList(ONE)), Operator.GTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(setAppliesTo(bound, set(ONE), list(ONE))); assertTrue(setAppliesTo(bound, set(), list())); @@ -443,7 +443,7 @@ public class ColumnConditionTest Maps.Value placeholder = new Maps.Value(placeholderMap); // EQ - ColumnCondition condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.EQ); + ColumnCondition condition = ColumnCondition.condition(definition, null, placeholder, Operator.EQ); ColumnCondition.CollectionBound bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); @@ -465,7 +465,7 @@ public class ColumnConditionTest assertTrue(mapAppliesTo(bound, map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER), map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER))); // NEQ - condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.NEQ); + condition = ColumnCondition.condition(definition, null, placeholder, Operator.NEQ); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); @@ -487,7 +487,7 @@ public class ColumnConditionTest assertFalse(mapAppliesTo(bound, map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER), map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LT - condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.LT); + condition = ColumnCondition.condition(definition, null, placeholder, Operator.LT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); @@ -509,7 +509,7 @@ public class ColumnConditionTest assertFalse(mapAppliesTo(bound, map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER), map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER))); // LTE - condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.LTE); + condition = ColumnCondition.condition(definition, null, placeholder, Operator.LTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); @@ -531,7 +531,7 @@ public class ColumnConditionTest assertTrue(mapAppliesTo(bound, map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER), map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GT - condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.GT); + condition = ColumnCondition.condition(definition, null, placeholder, Operator.GT); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertFalse(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); @@ -553,7 +553,7 @@ public class ColumnConditionTest assertFalse(mapAppliesTo(bound, map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER), map(ONE, ByteBufferUtil.EMPTY_BYTE_BUFFER))); // GTE - condition = ColumnCondition.condition(definition, null, placeholder, Relation.Type.GTE); + condition = ColumnCondition.condition(definition, null, placeholder, Operator.GTE); bound = (ColumnCondition.CollectionBound) condition.bind(QueryOptions.DEFAULT); assertTrue(mapAppliesTo(bound, map(ONE, ONE), map(ONE, ONE))); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5117a5d5/test/unit/org/apache/cassandra/db/CleanupTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java index 79a8470..06f8997 100644 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.db; -import static org.junit.Assert.assertEquals; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; @@ -29,11 +28,14 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; -import org.apache.cassandra.db.filter.IDiskAtomFilter; +import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.dht.BytesToken; import org.apache.cassandra.dht.Range; @@ -41,7 +43,8 @@ import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class CleanupTest extends SchemaLoader { @@ -106,7 +109,7 @@ public class CleanupTest extends SchemaLoader Thread.sleep(10); // verify we get it back w/ index query too - IndexExpression expr = new IndexExpression(COLUMN, IndexExpression.Operator.EQ, VALUE); + IndexExpression expr = new IndexExpression(COLUMN, Operator.EQ, VALUE); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5117a5d5/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 0aa33a6..243b2d2 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -56,6 +56,7 @@ import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.IndexType; import org.apache.cassandra.config.Schema; +import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; @@ -235,7 +236,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.apply(); // basic single-expression query - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -254,7 +255,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader assert ByteBufferUtil.bytes(1L).equals( rows.get(1).cf.getColumn(birthdate).value()); // add a second expression - IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.GTE, ByteBufferUtil.bytes(2L)); + IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), Operator.GTE, ByteBufferUtil.bytes(2L)); clause = Arrays.asList(expr, expr2); rows = cfs.search(range, clause, filter, 100); @@ -283,7 +284,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader // query with index hit but rejected by secondary clause, with a small enough count that just checking count // doesn't tell the scan loop that it's done - IndexExpression expr3 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(-1L)); + IndexExpression expr3 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), Operator.EQ, ByteBufferUtil.bytes(-1L)); clause = Arrays.asList(expr, expr3); rows = cfs.search(range, clause, filter, 100); @@ -303,8 +304,8 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.applyUnsafe(); } - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(34L)); - IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(34L)); + IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr, expr2); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -329,7 +330,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add("Indexed1", cellname("birthdate"), ByteBufferUtil.bytes(1L), 0); rm.apply(); - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -348,7 +349,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader // verify that it's not being indexed under the deletion column value either Cell deletion = rm.getColumnFamilies().iterator().next().iterator().next(); ByteBuffer deletionLong = ByteBufferUtil.bytes((long) ByteBufferUtil.toInt(deletion.value())); - IndexExpression expr0 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, deletionLong); + IndexExpression expr0 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, deletionLong); List clause0 = Arrays.asList(expr0); rows = cfs.search(range, clause0, filter, 100); assert rows.isEmpty(); @@ -429,14 +430,14 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add("Indexed1", birthdate, ByteBufferUtil.bytes(2L), 2); rm.apply(); - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); List rows = cfs.search(range, clause, filter, 100); assert rows.size() == 0; - expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(2L)); + expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(2L)); clause = Arrays.asList(expr); rows = keyspace.getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); String key = ByteBufferUtil.string(rows.get(0).key.getKey()); @@ -465,7 +466,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add("Indexed1", cellname("birthdate"), ByteBufferUtil.bytes(100L), 1, 1000); rm.apply(); - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(100L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(100L)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -488,7 +489,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add("Indexed1", cellname("birthdate"), ByteBufferUtil.bytes(101L), 1, 1000); rm.apply(); - expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(101L)); + expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(101L)); clause = Arrays.asList(expr); rows = keyspace.getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); assertEquals(1, rows.size()); @@ -501,7 +502,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rows = keyspace.getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); assertEquals(0, rows.size()); // and for the new - expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(102L)); + expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(102L)); clause = Arrays.asList(expr); rows = keyspace.getColumnFamilyStore("Indexed1").search(range, clause, filter, 100); assertEquals(1, rows.size()); @@ -527,7 +528,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm = new Mutation(keySpace, rowKey); rm.add(cfName, colName, val1, 0); rm.apply(); - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, val1); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, val1); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -549,7 +550,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rows = keyspace.getColumnFamilyStore(cfName).search(range, clause, filter, 100); assertEquals(0, rows.size()); // now check for the updated value - expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, val2); + expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, val2); clause = Arrays.asList(expr); filter = new IdentityQueryFilter(); range = Util.range("", ""); @@ -562,7 +563,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add(cfName, colName, ByteBufferUtil.bytes(1L), 3); keyspace.apply(rm, true, false); - expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); clause = Arrays.asList(expr); filter = new IdentityQueryFilter(); range = Util.range("", ""); @@ -597,7 +598,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.apply(); // test that the index query fetches this version - IndexExpression expr = new IndexExpression(colName, IndexExpression.Operator.EQ, val1); + IndexExpression expr = new IndexExpression(colName, Operator.EQ, val1); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -621,7 +622,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rows = keyspace.getColumnFamilyStore(cfName).search(range, clause, filter, 100); assertEquals(0, rows.size()); // now check for the updated value - expr = new IndexExpression(colName, IndexExpression.Operator.EQ, val2); + expr = new IndexExpression(colName, Operator.EQ, val2); clause = Arrays.asList(expr); filter = new IdentityQueryFilter(); range = Util.range("", ""); @@ -634,7 +635,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.add(cfName, compositeName, val1, 2); keyspace.apply(rm, true, false); - expr = new IndexExpression(colName, IndexExpression.Operator.EQ, val1); + expr = new IndexExpression(colName, Operator.EQ, val1); clause = Arrays.asList(expr); filter = new IdentityQueryFilter(); range = Util.range("", ""); @@ -680,7 +681,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader // Read the index and we check we do get no value (and no NPE) // Note: the index will return the entry because it hasn't been deleted (we // haven't read yet nor compacted) but the data read itself will return null - IndexExpression expr = new IndexExpression(colName, IndexExpression.Operator.EQ, val1); + IndexExpression expr = new IndexExpression(colName, Operator.EQ, val1); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -719,8 +720,8 @@ public class ColumnFamilyStoreTest extends SchemaLoader rm.apply(); // basic single-expression query - IndexExpression expr1 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); - IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), IndexExpression.Operator.GT, ByteBufferUtil.bytes(1L)); + IndexExpression expr1 = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr2 = new IndexExpression(ByteBufferUtil.bytes("notbirthdate"), Operator.GT, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr1, expr2); IDiskAtomFilter filter = new IdentityQueryFilter(); Range range = Util.range("", ""); @@ -764,7 +765,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader private void queryBirthdate(Keyspace keyspace) throws CharacterCodingException { - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter(); List rows = keyspace.getColumnFamilyStore("Indexed2").search(Util.range("", ""), clause, filter, 100); @@ -1419,7 +1420,7 @@ public class ColumnFamilyStoreTest extends SchemaLoader store.forceBlockingFlush(); - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, LongType.instance.decompose(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, LongType.instance.decompose(1L)); // explicitly tell to the KeysSearcher to use column limiting for rowsPerQuery to trigger bogus columnsRead--; (CASSANDRA-3996) List rows = store.search(store.makeExtendedFilter(Util.range("", ""), new IdentityQueryFilter(), Arrays.asList(expr), 10, true, false, System.currentTimeMillis())); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5117a5d5/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 ef6b14a..a99aa0c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -44,6 +44,7 @@ import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.BufferDecoratedKey; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.ColumnFamilyStore; @@ -456,7 +457,7 @@ public class SSTableReaderTest extends SchemaLoader clearAndLoad(cfs); // query using index to see if sstable for secondary index opens - IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexExpression.Operator.EQ, ByteBufferUtil.bytes(1L)); + IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), Operator.EQ, ByteBufferUtil.bytes(1L)); List clause = Arrays.asList(expr); Range range = Util.range("", ""); List rows = indexedCFS.search(range, clause, new IdentityQueryFilter(), 100); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5117a5d5/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 2b5d029..5d44210 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -36,6 +36,7 @@ import org.apache.cassandra.OrderedJUnit4ClassRunner; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.cql3.Operator; import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.context.CounterContext; @@ -241,7 +242,7 @@ public class StreamingTransferTest extends SchemaLoader { long val = key.hashCode(); IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), - IndexExpression.Operator.EQ, + Operator.EQ, ByteBufferUtil.bytes(val)); List clause = Arrays.asList(expr); IDiskAtomFilter filter = new IdentityQueryFilter();