You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/09/19 12:00:06 UTC
[1/2] git commit: Fix sstable2json for CQL3 tables
Updated Branches:
refs/heads/cassandra-1.2 eb390d02e -> 937536363
Fix sstable2json for CQL3 tables
patch by lyubent; reviewed by slebresne for CASSANDRA-5852
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a886e349
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a886e349
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a886e349
Branch: refs/heads/cassandra-1.2
Commit: a886e34909c313a1c3fa5dff48b77f1cee2c6847
Parents: eb390d0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 19 11:56:17 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 19 11:56:17 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/config/CFMetaData.java | 15 ++++++++++++++-
.../org/apache/cassandra/tools/SSTableImport.java | 7 ++++++-
3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a886e349/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c6e1169..f853cce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,6 +21,7 @@
* Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011)
* Move hints and exception count to o.a.c.metrics (CASSANDRA-6017)
* Fix memory leak in snapshot repair (CASSANDRA-6047)
+ * Fix sstable2sjon for CQL3 tables (CASSANDRA-5852)
1.2.9
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a886e349/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 33e3f00..4355737 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -995,7 +995,18 @@ public final class CFMetaData
ByteBuffer[] components = composite.split(columnName);
for (ColumnDefinition def : column_metadata.values())
{
- ByteBuffer toCompare = def.componentIndex == null ? columnName : components[def.componentIndex];
+ ByteBuffer toCompare;
+ if (def.componentIndex == null)
+ {
+ toCompare = columnName;
+ }
+ else
+ {
+ if (def.componentIndex >= components.length)
+ break;
+
+ toCompare = components[def.componentIndex];
+ }
if (def.name.equals(toCompare))
return def;
}
@@ -1007,6 +1018,8 @@ public final class CFMetaData
}
}
+
+
public ColumnDefinition getColumnDefinitionForIndex(String indexName)
{
for (ColumnDefinition def : column_metadata.values())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a886e349/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 71b1b60..68d4397 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -156,7 +156,7 @@ public class SSTableImport
}
value = isDeleted() ? ByteBufferUtil.hexToBytes((String) fields.get(1))
- : stringAsType((String) fields.get(1), meta.getValueValidator(name.duplicate()));
+ : stringAsType((String) fields.get(1), meta.getValueValidator(meta.getColumnDefinitionFromColumnName(name)));
}
}
@@ -245,6 +245,11 @@ public class SSTableImport
{
cfamily.addAtom(new RangeTombstone(col.getName(), col.getValue(), col.timestamp, col.localExpirationTime));
}
+ // cql3 row marker, see CASSANDRA-5852
+ else if (!path.columnName.hasRemaining())
+ {
+ cfamily.addColumn(new QueryPath(cfm.cfName, superName, ByteBuffer.wrap(new byte[3])), col.getValue(), col.timestamp);
+ }
else
{
cfamily.addColumn(path, col.getValue(), col.timestamp);
[2/2] git commit: Update version for 1.2.10 release
Posted by sl...@apache.org.
Update version for 1.2.10 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93753636
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93753636
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93753636
Branch: refs/heads/cassandra-1.2
Commit: 937536363a8a6d86ee32fe5ef90653264e67b6c7
Parents: a886e34
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 19 11:59:58 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 19 11:59:58 2013 +0200
----------------------------------------------------------------------
NEWS.txt | 9 +++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93753636/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 1f3f675..78c8a4c 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,15 @@ restore snapshots created with the previous major version using the
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+1.2.10
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 1.2.9 if you are upgrading
+ from a previous version.
+
+
1.2.9
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93753636/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 122759c..74c7374 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.9"/>
+ <property name="base.version" value="1.2.10"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/93753636/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 62ee968..63f75b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.10) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Thu, 19 Sep 2013 11:58:12 +0200
+
cassandra (1.2.9) unstable; urgency=low
* New release