Updated Branches: refs/heads/trunk e37ca25cf -> 6afbed371
fix build and test error, should not use QueryPath Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6afbed37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6afbed37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6afbed37 Branch: refs/heads/trunk Commit: 6afbed371c0d12a15a969e4f52ba670998bab282 Parents: e37ca25 Author: Marcus Eriksson <marc...@spotify.com> Authored: Fri Apr 5 10:40:50 2013 +0200 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Fri Apr 5 10:40:50 2013 +0200 ---------------------------------------------------------------------- .../apache/cassandra/config/ColumnDefinition.java | 4 +++- test/unit/org/apache/cassandra/SchemaLoader.java | 2 +- .../db/index/PerRowSecondaryIndexTest.java | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java index fed095d..a777d1a 100644 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@ -20,6 +20,7 @@ package org.apache.cassandra.config; import java.nio.ByteBuffer; import java.util.*; +import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Objects; import com.google.common.collect.Maps; @@ -97,7 +98,8 @@ public class ColumnDefinition this(name, validator, null, null, null, componentIndex, type); } - private ColumnDefinition(ByteBuffer name, AbstractType<?> validator, IndexType index_type, Map<String, String> index_options, String index_name, Integer componentIndex, Type type) + @VisibleForTesting + public ColumnDefinition(ByteBuffer name, AbstractType<?> validator, IndexType index_type, Map<String, String> index_options, String index_name, Integer componentIndex, Type type) { assert name != null && validator != null; this.name = name; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 55e5591..0035b1e 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -310,7 +310,7 @@ public class SchemaLoader IndexType.CUSTOM, indexOptions, ByteBufferUtil.bytesToHex(cName), - null)); + null, ColumnDefinition.Type.REGULAR)); }}); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/6afbed37/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java index 3a4f947..4ca84cb 100644 --- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java @@ -50,7 +50,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader // create a row then test that the configured index instance was able to read the row RowMutation rm; rm = new RowMutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k1")); - rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("indexed")), ByteBufferUtil.bytes("foo"), 1); + rm.add("Indexed1", ByteBufferUtil.bytes("indexed"), ByteBufferUtil.bytes("foo"), 1); rm.apply(); ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW; @@ -59,7 +59,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader // update the row and verify what was indexed rm = new RowMutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k1")); - rm.add(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("indexed")), ByteBufferUtil.bytes("bar"), 2); + rm.add("Indexed1", ByteBufferUtil.bytes("indexed"), ByteBufferUtil.bytes("bar"), 2); rm.apply(); indexedRow = TestIndex.LAST_INDEXED_ROW; @@ -80,7 +80,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader public void index(ByteBuffer rowKey) { QueryFilter filter = QueryFilter.getIdentityFilter(DatabaseDescriptor.getPartitioner().decorateKey(rowKey), - new QueryPath(baseCfs.getColumnFamilyName())); + baseCfs.getColumnFamilyName()); LAST_INDEXED_ROW = baseCfs.getColumnFamily(filter); } @@ -144,7 +144,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader } @Override - public void truncate(long truncatedAt) + public void truncateBlocking(long truncatedAt) { } }
