Repository: hbase Updated Branches: refs/heads/master c88b4c46a -> b79d6bf72
HBASE-4495 CatalogTracker has an identity crisis; needs to be cut-back in scope (Mikhail Antonov); REMOVE ByteString.java accidentally added Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b79d6bf7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b79d6bf7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b79d6bf7 Branch: refs/heads/master Commit: b79d6bf72989610abdd4d14e0c62d4363b828f6c Parents: c88b4c4 Author: stack <[email protected]> Authored: Wed Jul 2 23:03:19 2014 -0700 Committer: stack <[email protected]> Committed: Wed Jul 2 23:03:19 2014 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/util/ByteStringer.java | 68 -------------------- 1 file changed, 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b79d6bf7/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java deleted file mode 100644 index ca8383d..0000000 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/util/ByteStringer.java +++ /dev/null @@ -1,68 +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 org.apache.hadoop.hbase.util; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.google.protobuf.ByteString; -import com.google.protobuf.HBaseZeroCopyByteString; -import org.apache.hadoop.hbase.util.ByteStringer; - -/** - * Hack to workaround HBASE-1304 issue that keeps bubbling up when a mapreduce context. - */ -public class ByteStringer { - private static final Log LOG = LogFactory.getLog(ByteStringer.class); - - /** - * Flag set at class loading time. - */ - private static boolean USE_ZEROCOPYBYTESTRING = true; - - // Can I classload HBaseZeroCopyByteString without IllegalAccessError? - // If we can, use it passing ByteStrings to pb else use native ByteString though more costly - // because it makes a copy of the passed in array. - static { - try { - HBaseZeroCopyByteString.wrap(new byte [0]); - } catch (IllegalAccessError iae) { - USE_ZEROCOPYBYTESTRING = false; - LOG.debug("Failed to classload HBaseZeroCopyByteString: " + iae.toString()); - } - } - - private ByteStringer() { - super(); - } - - /** - * Wraps a byte array in a {@link ByteString} without copying it. - */ - public static ByteString wrap(final byte[] array) { - return USE_ZEROCOPYBYTESTRING? HBaseZeroCopyByteString.wrap(array): ByteString.copyFrom(array); - } - - /** - * Wraps a subset of a byte array in a {@link ByteString} without copying it. - */ - public static ByteString wrap(final byte[] array, int offset, int length) { - return USE_ZEROCOPYBYTESTRING? HBaseZeroCopyByteString.wrap(array, offset, length): - ByteString.copyFrom(array, offset, length); - } -}
