cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r774945 - in /incubator/cassandra/branches/cassandra-0.3: lib/ src/java/org/apache/cassandra/concurrent/ src/java/org/apache/cassandra/continuations/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/io/ src/java/org/apache/ca...
Date Thu, 14 May 2009 22:02:02 GMT
Author: jbellis
Date: Thu May 14 22:02:02 2009
New Revision: 774945

URL: http://svn.apache.org/viewvc?rev=774945&view=rev
Log:
r/m ASM library.  patch by johano; reviewed by jbellis for CASSANDRA-179

Removed:
    incubator/cassandra/branches/cassandra-0.3/lib/asm-all-2.2.1.jar
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/continuations/
Modified:
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationContext.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationStage.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/db/IdentityFilter.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataInputBuffer.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataOutputBuffer.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
    incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/test/TestRunner.java

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationContext.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationContext.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationContext.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationContext.java
Thu May 14 22:02:02 2009
@@ -18,7 +18,6 @@
 
 package org.apache.cassandra.concurrent;
 
-import org.apache.cassandra.continuations.Suspendable;
 import org.apache.commons.javaflow.Continuation;
 
 public class ContinuationContext

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationStage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationStage.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationStage.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/concurrent/ContinuationStage.java
Thu May 14 22:02:02 2009
@@ -25,8 +25,6 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.apache.cassandra.continuations.Suspendable;
-
 
 public class ContinuationStage implements IStage
 {

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/db/IdentityFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/db/IdentityFilter.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/db/IdentityFilter.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/db/IdentityFilter.java
Thu May 14 22:02:02 2009
@@ -1,29 +1,27 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one
-* or more contributor license agreements.  See the NOTICE file
-* distributed with this work for additional information
-* regarding copyright ownership.  The ASF licenses this file
-* to you under the Apache License, Version 2.0 (the
-* "License"); you may not use this file except in compliance
-* with the License.  You may obtain a copy of the License at
-*
-*    http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing,
-* software distributed under the License is distributed on an
-* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-* KIND, either express or implied.  See the License for the
-* specific language governing permissions and limitations
-* under the License.
-*/
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*    http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 package org.apache.cassandra.db;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.Collection;
 
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.continuations.Suspendable;
 import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.io.SSTable;
 

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataInputBuffer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataInputBuffer.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataInputBuffer.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataInputBuffer.java
Thu May 14 22:02:02 2009
@@ -19,10 +19,6 @@
 package org.apache.cassandra.io;
 
 import java.io.*;
-import java.nio.ByteBuffer;
-import java.util.Random;
-
-import org.apache.cassandra.continuations.Suspendable;
 
 
 /**

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataOutputBuffer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataOutputBuffer.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataOutputBuffer.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/io/DataOutputBuffer.java
Thu May 14 22:02:02 2009
@@ -18,13 +18,10 @@
 
 package org.apache.cassandra.io;
 
-import java.io.*;
-import java.nio.ByteBuffer;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-import java.util.Arrays;
-
-import org.apache.cassandra.continuations.Suspendable;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataOutputStream;
+import java.io.IOException;
 
 
 /**

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/net/MessageDeliveryTask.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
Thu May 14 22:02:02 2009
@@ -18,8 +18,6 @@
 
 package org.apache.cassandra.net;
 
-import org.apache.cassandra.continuations.Suspendable;
-import org.apache.cassandra.utils.LogUtil;
 import org.apache.log4j.Logger;
 
 

Modified: incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/test/TestRunner.java?rev=774945&r1=774944&r2=774945&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/test/TestRunner.java
(original)
+++ incubator/cassandra/branches/cassandra-0.3/src/java/org/apache/cassandra/test/TestRunner.java
Thu May 14 22:02:02 2009
@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.cassandra.continuations.Suspendable;
 import org.apache.cassandra.db.ColumnFamily;
 import org.apache.cassandra.db.IColumn;
 import org.apache.cassandra.db.RowMutation;
@@ -236,7 +235,6 @@
     }
 }
 
-@Suspendable
 class Scanner implements Runnable
 {   
     private static final Logger logger_ = Logger.getLogger(Scanner.class);



Mime
View raw message