You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/09/03 18:45:01 UTC
[1/5] cassandra git commit: Remove dead code
Repository: cassandra
Updated Branches:
refs/heads/trunk 966bea74b -> 829b9b78c
Remove dead code
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a86d221
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a86d221
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a86d221
Branch: refs/heads/trunk
Commit: 6a86d221a5b4dc11784a022917d0e4c6845e03aa
Parents: 796b0f2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Sep 2 17:22:53 2015 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Sep 2 17:22:53 2015 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ReadCommand.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a86d221/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 0bc8cea..0ccd229 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -971,21 +971,12 @@ public abstract class ReadCommand implements ReadQuery
LegacyLayout.LegacyBound startBound = LegacyLayout.decodeBound(metadata, ByteBufferUtil.readWithShortLength(in), true);
ByteBufferUtil.readWithShortLength(in); // the composite "stop", which isn't actually needed
- // pre-3.0 nodes will sometimes use a clustering prefix for the Command-level start and stop, but in all
- // cases this should also be represented by the ClusteringIndexFilter, so we can ignore them
- Clustering startClustering;
- if (startBound == LegacyLayout.LegacyBound.BOTTOM || startBound.bound.size() < metadata.comparator.size())
- startClustering = Clustering.EMPTY;
- else
- startClustering = startBound.getAsClustering(metadata);
-
ColumnFilter selection = LegacyRangeSliceCommandSerializer.getColumnSelectionForSlice(filter, compositesToGroup, metadata);
RowFilter rowFilter = LegacyRangeSliceCommandSerializer.deserializeRowFilter(in, metadata);
int maxResults = in.readInt();
in.readBoolean(); // countCQL3Rows
-
boolean selectsStatics = (!selection.fetchedColumns().statics.isEmpty() || filter.selects(Clustering.STATIC_CLUSTERING));
boolean isDistinct = compositesToGroup == -2 || (perPartitionLimit == 1 && selectsStatics);
DataLimits limits;
[3/5] cassandra git commit: Fix failure to start with space in
directory name on Windows
Posted by jm...@apache.org.
Fix failure to start with space in directory name on Windows
Patch by jmckenzie; reviewed by pthompson for CASSANDRA-10239
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1fc0e06
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1fc0e06
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1fc0e06
Branch: refs/heads/trunk
Commit: e1fc0e06719a9fd26030ace31e3742da196074d6
Parents: f7644f2
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 3 12:39:43 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 3 12:39:43 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra.bat | 2 +-
conf/cassandra-env.ps1 | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 91ae36c..fcb9ed7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.2
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
* Fix repair hang when snapshot failed (CASSANDRA-10057)
* Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/bin/cassandra.bat
----------------------------------------------------------------------
diff --git a/bin/cassandra.bat b/bin/cassandra.bat
index 155aaf6..0d207cd 100644
--- a/bin/cassandra.bat
+++ b/bin/cassandra.bat
@@ -66,7 +66,7 @@ set JAVA_OPTS=-ea^
-XX:CMSInitiatingOccupancyFraction=75^
-XX:+UseCMSInitiatingOccupancyOnly^
-Dlogback.configurationFile=logback.xml^
- -Djava.library.path=%CASSANDRA_HOME%\lib\sigar-bin^
+ -Djava.library.path="%CASSANDRA_HOME%\lib\sigar-bin"^
-Dcassandra.jmx.local.port=7199
REM **** JMX REMOTE ACCESS SETTINGS SEE: https://wiki.apache.org/cassandra/JmxSecurity ***
REM -Dcom.sun.management.jmxremote.port=7199^
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1fc0e06/conf/cassandra-env.ps1
----------------------------------------------------------------------
diff --git a/conf/cassandra-env.ps1 b/conf/cassandra-env.ps1
index fc0f6fd..9708964 100644
--- a/conf/cassandra-env.ps1
+++ b/conf/cassandra-env.ps1
@@ -199,7 +199,7 @@ Function CalculateHeapSizes
#-----------------------------------------------------------------------------
Function SetJsr223Env
{
- $cp = """$env:CLASSPATH"""
+ $cp = $env:CLASSPATH
foreach ($jsrDir in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223")
{
foreach ($file in Get-ChildItem -Path "$env:CASSANDRA_HOME\lib\jsr223\$jsrDir\*.jar")
@@ -332,7 +332,7 @@ Function SetCassandraEnvironment
ParseJVMInfo
# Add sigar env - see Cassandra-7838
- $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=$env:CASSANDRA_HOME\lib\sigar-bin"
+ $env:JVM_OPTS = "$env:JVM_OPTS -Djava.library.path=""$env:CASSANDRA_HOME\lib\sigar-bin"""
# Confirm we're on high performance power plan, warn if not
# Change to $true to suppress this warning
[4/5] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9c0e178
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9c0e178
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9c0e178
Branch: refs/heads/trunk
Commit: e9c0e1787e44903109ed4520d055e983ca20c16e
Parents: 66b0e1d e1fc0e0
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 3 12:42:04 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 3 12:42:04 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra.bat | 2 +-
conf/cassandra-env.ps1 | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 751b75d,fcb9ed7..c1f6992
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-2.2.2
+3.0.0-beta2
+ * Improve batchlog write patch (CASSANDRA-9673)
+ * Re-apply MaterializedView updates on commitlog replay (CASSANDRA-10164)
+ * Require AbstractType.isByteOrderComparable declaration in constructor (CASSANDRA-9901)
+ * Avoid digest mismatch on upgrade to 3.0 (CASSANDRA-9554)
+ * Fix Materialized View builder when adding multiple MVs (CASSANDRA-10156)
+ * Choose better poolingOptions for protocol v4 in cassandra-stress (CASSANDRA-10182)
+ * Fix LWW bug affecting Materialized Views (CASSANDRA-10197)
+ * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
+ * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
+ * Fix double flushing of secondary index tables (CASSANDRA-10180)
+ * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
* Fix repair hang when snapshot failed (CASSANDRA-10057)
* Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9c0e178/conf/cassandra-env.ps1
----------------------------------------------------------------------
[5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/829b9b78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/829b9b78
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/829b9b78
Branch: refs/heads/trunk
Commit: 829b9b78c04d0645b1f3e842de68ca598c5e1250
Parents: 966bea7 e9c0e17
Author: Joshua McKenzie <jm...@apache.org>
Authored: Thu Sep 3 12:42:30 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Thu Sep 3 12:42:30 2015 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cassandra.bat | 2 +-
conf/cassandra-env.ps1 | 4 ++--
src/java/org/apache/cassandra/db/ReadCommand.java | 9 ---------
4 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/829b9b78/CHANGES.txt
----------------------------------------------------------------------
[2/5] cassandra git commit: Fix SSTableLoaderTest on Windows
Posted by jm...@apache.org.
Fix SSTableLoaderTest on Windows
Patch by pmotta; reviewed by jmckenzie for CASSANDRA-10210
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66b0e1d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66b0e1d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66b0e1d7
Branch: refs/heads/trunk
Commit: 66b0e1d7889d0858753c6e364e77d86fe278eee4
Parents: 6a86d22
Author: Paulo Motta <pa...@gmail.com>
Authored: Wed Sep 2 14:20:00 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Wed Sep 2 14:20:00 2015 -0400
----------------------------------------------------------------------
.../cassandra/io/sstable/SSTableLoaderTest.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66b0e1d7/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
index 3370e56..4eebdeb 100644
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableLoaderTest.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.db.partitions.*;
import org.apache.cassandra.db.marshal.AsciiType;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.io.FSWriteError;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
@@ -80,7 +81,18 @@ public class SSTableLoaderTest
@After
public void cleanup()
{
- FileUtils.deleteRecursive(tmpdir);
+ try {
+ FileUtils.deleteRecursive(tmpdir);
+ } catch (FSWriteError e) {
+ /**
+ * Windows does not allow a mapped file to be deleted, so we probably forgot to clean the buffers somewhere.
+ * We force a GC here to force buffer deallocation, and then try deleting the directory again.
+ * For more information, see: http://bugs.java.com/bugdatabase/view_bug.do?bug_id=4715154
+ * If this is not the problem, the exception will be rethrown anyway.
+ */
+ System.gc();
+ FileUtils.deleteRecursive(tmpdir);
+ }
}
private static final class TestClient extends SSTableLoader.Client