Author: jbellis
Date: Thu Aug 25 19:28:24 2011
New Revision: 1161709
URL: http://svn.apache.org/viewvc?rev=1161709&view=rev
Log:
merge from 0.8
Modified:
cassandra/trunk/ (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/build.xml
cassandra/trunk/conf/cassandra.yaml
cassandra/trunk/contrib/ (props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
(props changed)
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
(props changed)
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java
Propchange: cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0:1125021-1130369
/cassandra/branches/cassandra-0.8.1:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Aug 25 19:28:24 2011
@@ -73,6 +73,8 @@
CompactionManager.estimatedCompactions (CASSANDRA-2708)
* expose rpc timeouts per host in MessagingServiceMBean (CASSANDRA-2941)
* avoid including cwd in classpath for deb and rpm packages (CASSANDRA-2881)
+ * remove gossip state when a new IP takes over a token (CASSANDRA-3071)
+ * allow sstable2json to work on index sstable files (CASSANDRA-3059)
0.8.4
Modified: cassandra/trunk/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Thu Aug 25 19:28:24 2011
@@ -36,7 +36,6 @@
<property name="build.src" value="${basedir}/src"/>
<property name="build.src.java" value="${basedir}/src/java"/>
<property name="build.src.resources" value="${basedir}/src/resources"/>
- <property name="build.src.driver" value="${basedir}/drivers/java/src" />
<property name="avro.src" value="${basedir}/src/avro"/>
<property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
<property name="build.lib" value="${basedir}/lib"/>
@@ -46,7 +45,6 @@
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.classes.main" value="${build.classes}/main" />
<property name="build.classes.thrift" value="${build.classes}/thrift" />
- <property name="build.classes.cql" value="${build.classes}/cql" />
<property name="javadoc.dir" value="${build.dir}/javadoc"/>
<property name="javadoc.jars.dir" value="${build.dir}/javadocs"/>
<property name="interface.dir" value="${basedir}/interface"/>
@@ -161,7 +159,6 @@
message="Not a source artifact, stopping here." />
<mkdir dir="${build.classes.main}"/>
<mkdir dir="${build.classes.thrift}"/>
- <mkdir dir="${build.classes.cql}"/>
<mkdir dir="${test.lib}"/>
<mkdir dir="${test.classes}"/>
<mkdir dir="${build.src.gen-java}"/>
@@ -396,7 +393,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<dependency groupId="log4j" artifactId="log4j" version="1.2.16" />
<dependency groupId="org.apache.cassandra"
artifactId="cassandra-all" version="${version}" />
<dependency groupId="org.apache.cassandra"
artifactId="cassandra-thrift" version="${version}" />
- <dependency groupId="org.apache.cassandra"
artifactId="cassandra-cql" version="${version}" />
</dependencyManagement>
<developer id="alakshman" name="Avinash Lakshman"/>
<developer id="antelder" name="Anthony Elder"/>
@@ -503,22 +499,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<dependency groupId="org.slf4j" artifactId="slf4j-api"/>
<dependency groupId="org.apache.thrift" artifactId="libthrift"/>
</artifact:pom>
- <artifact:pom id="cql-pom"
- artifactId="cassandra-cql"
- url="http://cassandra.apache.org";
- name="Apache Cassandra">
- <parent groupId="org.apache.cassandra"
- artifactId="cassandra-parent"
- version="${version}"/>
- <scm connection="${scm.connection}"
developerConnection="${scm.developerConnection}" url="${scm.url}"/>
- <dependency groupId="com.google.guava" artifactId="guava"/>
- <dependency groupId="org.slf4j" artifactId="slf4j-api"/>
- <dependency groupId="org.apache.thrift" artifactId="libthrift"/>
- <dependency groupId="org.apache.cassandra"
artifactId="cassandra-thrift"/>
- <dependency groupId="org.apache.cassandra" artifactId="cassandra-all"/>
- <!-- because cassandra-all uses log4j, and we need cassandra-all,
consumers must use log4j, so force log4j version of slf4j -->
- <dependency groupId="org.slf4j" artifactId="slf4j-log4j12"
scope="runtime"/>
- </artifact:pom>
<artifact:pom id="dist-pom"
artifactId="apache-cassandra"
@@ -688,11 +668,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
</javac>
- <javac debug="true" debuglevel="${debuglevel}"
- destdir="${build.classes.cql}" includeantruntime="false">
- <src path="${build.src.driver}" />
- <classpath refid="cassandra.classpath"/>
- </javac>
<copy todir="${build.classes.main}">
<fileset dir="${build.src.resources}" />
</copy>
@@ -750,20 +725,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<!-- </section> -->
</manifest>
</jar>
-
- <!-- CQL driver Jar -->
- <artifact:writepom pomRefId="cql-pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"/>
- <jar
jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"
- basedir="${build.classes.cql}">
- <manifest>
- <attribute name="Implementation-Title" value="Cassandra"/>
- <attribute name="Implementation-Version" value="${version}"/>
- <attribute name="Implementation-Vendor" value="Apache"/>
- <attribute name="Class-Path"
- value="${ant.project.name}-thrift-${version}.jar" />
- </manifest>
- </jar>
</target>
<!--
@@ -789,23 +750,11 @@ url=${svn.entry.url}?pathrev=${svn.entry
<fileset dir="${build.src.gen-java}" defaultexcludes="yes">
<include name="org/apache/**/*.java"/>
</fileset>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
</filesets>
</create-javadoc>
<jar jarfile="${build.dir}/${final.name}-javadoc.jar"
basedir="${javadoc.jars.dir}/main"/>
- <create-javadoc destdir="${javadoc.jars.dir}/cql">
- <filesets>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
- </filesets>
- </create-javadoc>
- <jar
jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- basedir="${javadoc.jars.dir}/cql"/>
<!-- javadoc task always rebuilds so might as well remove the generated
docs to prevent
being pulled into the distribution by accident -->
<delete quiet="true" dir="${javadoc.jars.dir}"/>
@@ -827,14 +776,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<fileset dir="${build.src.gen-java}" defaultexcludes="yes">
<include name="org/apache/**/*.java"/>
</fileset>
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
- </jar>
- <jar
jarfile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar">
- <fileset dir="${build.src.driver}" defaultexcludes="yes">
- <include name="org/apache/**/*.java"/>
- </fileset>
</jar>
</target>
@@ -929,14 +870,12 @@ url=${svn.entry.url}?pathrev=${svn.entry
algorithm="MD5">
<fileset dir="${build.dir}">
<include name="*.tar.gz" />
- <include name="${ant.project.name}-cql-${cql.driver.version}.jar" />
</fileset>
</checksum>
<checksum forceOverwrite="yes" todir="${build.dir}" fileext=".sha"
algorithm="SHA">
<fileset dir="${build.dir}">
<include name="*.tar.gz" />
- <include name="${ant.project.name}-cql-${cql.driver.version}.jar" />
</fileset>
</checksum>
@@ -966,7 +905,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
destdir="${test.classes}">
<classpath>
<path refid="cassandra.classpath"/>
- <pathelement location="${build.classes.cql}"/>
</classpath>
<src path="${test.unit.src}"/>
<src path="${test.long.src}"/>
@@ -1019,7 +957,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<classpath>
<path refid="cassandra.classpath" />
<pathelement location="${test.classes}"/>
- <pathelement location="${build.classes.cql}"/>
<path refid="cobertura.classpath"/>
<pathelement location="${test.conf}"/>
<fileset dir="${test.lib}">
@@ -1205,8 +1142,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/gen-java"/>
<classpathentry kind="src" path="interface/thrift/gen-java"/>
- <classpathentry kind="src" path="drivers/java/src"/>
- <classpathentry kind="src" path="drivers/java/test"/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/long"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
@@ -1284,17 +1219,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<delete dir="build/eclipse-classes" />
</target>
- <target name="py-cql-driver"
- description="Generate Python CQL driver artifact">
- <echo>Creating Python CQL driver artifact...</echo>
- <exec executable="python" dir="${basedir}/drivers/py" failonerror="true">
- <arg line="setup.py" />
- <arg line="sdist" />
- <arg line="--dist-dir" />
- <arg line="${build.dir}" />
- </exec>
- </target>
-
<!-- Publish artifacts to Maven repositories -->
<target name="mvn-install"
depends="maven-declare-dependencies,artifacts,jar,sources-jar,javadoc-jar"
@@ -1337,16 +1261,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<install pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
-
- <!-- the cassandra-cql jar -->
- <install
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"/>
- <install
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar"
- classifier="sources"/>
- <install
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- classifier="javadoc"/>
</target>
<target name="publish"
@@ -1391,16 +1305,6 @@ url=${svn.entry.url}?pathrev=${svn.entry
<deploy pomFile="${build.dir}/${final.name}.pom"
file="${build.dir}/${final.name}-javadoc.jar"
classifier="javadoc"/>
-
- <!-- the cassandra-cql jar -->
- <deploy
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.jar"/>
- <deploy
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-sources.jar"
- classifier="sources"/>
- <deploy
pomFile="${build.dir}/${ant.project.name}-cql-${cql.driver.version}.pom"
-
file="${build.dir}/${ant.project.name}-cql-${cql.driver.version}-javadoc.jar"
- classifier="javadoc"/>
</target>
</project>
Modified: cassandra/trunk/conf/cassandra.yaml
URL:
http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra.yaml?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/conf/cassandra.yaml (original)
+++ cassandra/trunk/conf/cassandra.yaml Thu Aug 25 19:28:24 2011
@@ -379,9 +379,16 @@ request_scheduler: org.apache.cassandra.
# the request scheduling. Currently the only valid option is keyspace.
# request_scheduler_id: keyspace
-# The Index Interval determines how large the sampling of row keys
-# is for a given SSTable. The larger the sampling, the more effective
-# the index is at the cost of space.
+# index_interval controls the sampling of entries from the primrary
+# row index in terms of space versus time. The larger the interval,
+# the smaller and less effective the sampling will be. In technicial
+# terms, the interval coresponds to the number of index entries that
+# are skipped between taking each sample. All the sampled entries
+# must fit in memory. Generally, a value between 128 and 512 here
+# coupled with a large key cache size on CFs results in the best trade
+# offs. This value is not often changed, however if you have many
+# very small rows (many to an OS page), then increasing this will
+# often lower memory usage without a impact on performance.
index_interval: 128
# Enable or disable inter-node encryption
Propchange: cassandra/trunk/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/contrib:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
/cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689
Propchange:
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 25 19:28:24 2011
@@ -1,7 +1,7 @@
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1160444,1160825
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1160444,1160825,1161607
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1133844,1133846-1133917,1133919-1135156,1135158-1160459,1160827
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1161708
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Thu
Aug 25 19:28:24 2011
@@ -953,6 +953,16 @@ public final class CFMetaData
return column_metadata.get(name);
}
+ public ColumnDefinition getColumnDefinitionForIndex(String indexName)
+ {
+ for (ColumnDefinition def : column_metadata.values())
+ {
+ if (indexName.equals(def.getIndexName()))
+ return def;
+ }
+ return null;
+ }
+
/**
* Convert a null index_name to appropriate default name according to
column status
* @param cf_def Thrift ColumnFamily Definition
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Thu
Aug 25 19:28:24 2011
@@ -52,6 +52,8 @@ import org.apache.cassandra.db.compactio
import org.apache.cassandra.db.filter.*;
import org.apache.cassandra.db.index.SecondaryIndexManager;
import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.LocalByPartionerType;
import org.apache.cassandra.dht.*;
import org.apache.cassandra.io.sstable.*;
import org.apache.cassandra.io.util.FileUtils;
@@ -261,7 +263,6 @@ public class ColumnFamilyStore implement
}
}
-
// called when dropping or renaming a CF. Performs mbean housekeeping and
invalidates CFS to other operations.
public void unregisterMBean()
{
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/index/keys/KeysIndex.java
Thu Aug 25 19:28:24 2011
@@ -62,22 +62,23 @@ public class KeysIndex extends Secondary
public KeysIndex(ColumnFamilyStore baseCfs, ColumnDefinition cdef)
{
super(baseCfs, cdef);
-
fullMemtables = new ConcurrentSkipListSet<Memtable>();
- IPartitioner<?> rowPartitioner = StorageService.getPartitioner();
- AbstractType<?> columnComparator = (rowPartitioner instanceof
OrderPreservingPartitioner || rowPartitioner instanceof ByteOrderedPartitioner)
- ? BytesType.instance
- : new
LocalByPartionerType(StorageService.getPartitioner());
-
- final CFMetaData indexedCfMetadata =
CFMetaData.newIndexMetadata(baseCfs.metadata, cdef, columnComparator);
-
+ CFMetaData indexedCfMetadata =
CFMetaData.newIndexMetadata(baseCfs.metadata, cdef, indexComparator());
indexedCfs = ColumnFamilyStore.createColumnFamilyStore(baseCfs.table,
indexedCfMetadata.cfName,
new
LocalPartitioner(cdef.getValidator()),
indexedCfMetadata);
}
+ public static AbstractType indexComparator()
+ {
+ IPartitioner rowPartitioner = StorageService.getPartitioner();
+ return (rowPartitioner instanceof OrderPreservingPartitioner ||
rowPartitioner instanceof ByteOrderedPartitioner)
+ ? BytesType.instance
+ : new
LocalByPartionerType(StorageService.getPartitioner());
+ }
+
public IndexType type()
{
return IndexType.KEYS;
Modified:
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
Thu Aug 25 19:28:24 2011
@@ -105,8 +105,12 @@ public class SSTableReader extends SSTab
public static SSTableReader open(Descriptor desc) throws IOException
{
- Set<Component> components = componentsFor(desc,
Descriptor.TempState.ANY);
- return open(desc, components,
Schema.instance.getCFMetaData(desc.ksname, desc.cfname),
StorageService.getPartitioner());
+ return open(desc, Schema.instance.getCFMetaData(desc.ksname,
desc.cfname));
+ }
+
+ public static SSTableReader open(Descriptor desc, CFMetaData metadata)
throws IOException
+ {
+ return open(desc, componentsFor(desc, Descriptor.TempState.LIVE),
metadata, StorageService.getPartitioner());
}
public static SSTableReader open(Descriptor descriptor, Set<Component>
components, CFMetaData metadata, IPartitioner partitioner) throws IOException
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/GCInspector.java Thu
Aug 25 19:28:24 2011
@@ -107,7 +107,6 @@ public class GCInspector
if (previousCount == null)
previousCount = 0L;
gccounts.put(gc.getName(), count);
- assert count > previousCount;
MemoryUsage mu = membean.getHeapMemoryUsage();
long memoryUsed = mu.getUsed();
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Thu Aug 25 19:28:24 2011
@@ -606,6 +606,8 @@ public class StorageService implements I
{
if (endpoint.equals(FBUtilities.getBroadcastAddress()))
rpcaddrs.add(DatabaseDescriptor.getRpcAddress().getHostAddress());
+ else if
(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.RPC_ADDRESS)
== null)
+ rpcaddrs.add(endpoint.getHostAddress());
else
rpcaddrs.add(Gossiper.instance.getEndpointStateForEndpoint(endpoint).getApplicationState(ApplicationState.RPC_ADDRESS).value);
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java?rev=1161709&r1=1161708&r2=1161709&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/SSTableExport.java Thu
Aug 25 19:28:24 2011
@@ -25,6 +25,7 @@ import java.nio.ByteBuffer;
import java.util.*;
import org.apache.cassandra.config.CFMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
@@ -333,7 +334,23 @@ public class SSTableExport
*/
public static void export(String ssTableFile, PrintStream outs, String[]
excludes) throws IOException
{
- export(SSTableReader.open(Descriptor.fromFilename(ssTableFile)), outs,
excludes);
+ Descriptor descriptor = Descriptor.fromFilename(ssTableFile);
+ CFMetaData metadata;
+ if (descriptor.cfname.contains("."))
+ {
+ // look up index metadata from parent
+ int i = descriptor.cfname.indexOf(".");
+ String parentName = descriptor.cfname.substring(0, i);
+ CFMetaData parent =
DatabaseDescriptor.getCFMetaData(descriptor.ksname, parentName);
+ ColumnDefinition def =
parent.getColumnDefinitionForIndex(descriptor.cfname.substring(i + 1));
+ metadata = CFMetaData.newIndexMetadata(parent, def,
ColumnFamilyStore.indexComparator());
+ }
+ else
+ {
+ metadata = DatabaseDescriptor.getCFMetaData(descriptor.ksname,
descriptor.cfname);
+ }
+
+ export(SSTableReader.open(descriptor, metadata), outs, excludes);
}
/**
