cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/9] git commit: merge from 1.0
Date Mon, 16 Jan 2012 19:31:56 GMT
Updated Branches:
  refs/heads/trunk 9ad560d2f -> 44a7db706


merge from 1.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44a7db70
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44a7db70
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44a7db70

Branch: refs/heads/trunk
Commit: 44a7db706885430128d305adb56899595eccc8ae
Parents: f458cc1 181022b
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Jan 16 13:31:37 2012 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Jan 16 13:31:37 2012 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |   17 +++--
 .../cassandra/db/marshal/DynamicCompositeType.java |   54 ++++++++++++++-
 test/unit/org/apache/cassandra/db/ScrubTest.java   |    4 +-
 .../db/marshal/DynamicCompositeTypeTest.java       |   28 ++++++++
 .../cassandra/io/sstable/SSTableReaderTest.java    |    2 +-
 5 files changed, 92 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a7db70/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a7db70/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a7db70/test/unit/org/apache/cassandra/db/ScrubTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/ScrubTest.java
index f8620f7,36ff064..be668de
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@@ -65,9 -67,11 +65,9 @@@ public class ScrubTest extends CleanupH
          {
              if (srcFile.getName().equals(".svn"))
                  continue;
 -            File destFile = new File(destDirs[0]+File.separator+srcFile.getName());
 +            File destFile = new File(destDir, srcFile.getName());
-             CLibrary.createHardLinkWithExec(srcFile, destFile);
-                         
+             CLibrary.createHardLink(srcFile, destFile);
 -                        
 -            destFile = new File(destDirs[0]+File.separator+srcFile.getName());
 -                        
++
              assert destFile.exists() : destFile.getAbsoluteFile();
              
              if(destFile.getName().endsWith("Data.db"))

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44a7db70/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
index 81cc016,aff92cf..b801f4e
--- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
@@@ -229,9 -230,11 +229,9 @@@ public class SSTableReaderTest extends 
          {
              if (!srcFile.getName().startsWith("Indexed1"))
                  continue;
 -            File destFile = new File(destDirs[0] + File.separator + srcFile.getName());
 +            File destFile = new File(destDir, srcFile.getName());
-             CLibrary.createHardLinkWithExec(srcFile, destFile);
+             CLibrary.createHardLink(srcFile, destFile);
  
 -            destFile = new File(destDirs[0] + File.separator + srcFile.getName());
 -
              assert destFile.exists() : destFile.getAbsoluteFile();
          }
          ColumnFamilyStore store = Table.open("Keyspace1").getColumnFamilyStore("Indexed1");


Mime
View raw message