You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/02/19 15:29:27 UTC
cassandra git commit: fix merges
Repository: cassandra
Updated Branches:
refs/heads/trunk 18d8f26dd -> 3e43ea46e
fix merges
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e43ea46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e43ea46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e43ea46
Branch: refs/heads/trunk
Commit: 3e43ea46e86228e9132859c29f38d41241f1f5a9
Parents: 18d8f26
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Thu Feb 19 14:29:14 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Thu Feb 19 14:29:14 2015 +0000
----------------------------------------------------------------------
build.xml | 1 +
.../cassandra/db/PreHashedDecoratedKey.java | 42 ++++++++++++++++++++
src/jdkoverride/java/util/zip/CRC32.java | 42 --------------------
3 files changed, 43 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e43ea46/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index a3e524b..0b9d1a2 100644
--- a/build.xml
+++ b/build.xml
@@ -721,6 +721,7 @@
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<compilerarg value="-XDignore.symbol.file"/>
+ <compilerarg value="-Xbootclasspath/p:${build.src.jdkoverride}"/>
<classpath refid="cassandra.classpath"/>
</javac>
<antcall target="createVersionPropFile"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e43ea46/src/java/org/apache/cassandra/db/PreHashedDecoratedKey.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/PreHashedDecoratedKey.java b/src/java/org/apache/cassandra/db/PreHashedDecoratedKey.java
new file mode 100644
index 0000000..472cc19
--- /dev/null
+++ b/src/java/org/apache/cassandra/db/PreHashedDecoratedKey.java
@@ -0,0 +1,42 @@
+/*
+ * 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.nio.ByteBuffer;
+
+import org.apache.cassandra.dht.Token;
+
+public class PreHashedDecoratedKey extends BufferDecoratedKey
+{
+ final long hash0;
+ final long hash1;
+
+ public PreHashedDecoratedKey(Token token, ByteBuffer key, long hash0, long hash1)
+ {
+ super(token, key);
+ this.hash0 = hash0;
+ this.hash1 = hash1;
+ }
+
+ @Override
+ public void filterHash(long[] dest)
+ {
+ dest[0] = hash0;
+ dest[1] = hash1;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e43ea46/src/jdkoverride/java/util/zip/CRC32.java
----------------------------------------------------------------------
diff --git a/src/jdkoverride/java/util/zip/CRC32.java b/src/jdkoverride/java/util/zip/CRC32.java
deleted file mode 100644
index 93e1e6f..0000000
--- a/src/jdkoverride/java/util/zip/CRC32.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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 java.util.zip;
-
-import java.nio.ByteBuffer;
-
-/**
- * A fake implementation of java.util.zip.CRC32 with the additonal JDK 8 methods so
- * that when compiling using Java 7 we can link against those new methods and then
- * avoid calling them at runtime if running with Java 7.
- */
-public class CRC32 implements Checksum
-{
- public CRC32() {}
-
- public void update(int b) {}
-
- public void update(byte[] b, int off, int len) {}
-
- public void update(byte[] b) {}
-
- public void update(ByteBuffer buffer) {}
-
- public void reset() {}
-
- public long getValue() { return 0L; }
-}