Repository: hbase Updated Branches: refs/heads/branch-2 1728b48c8 -> 842678c99
HBASE-20120 Removed unused classes/ java files from hbase-server deleted: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/NoOpHeapMemoryTuner.java deleted: hbase-server/src/main/java/org/apache/hadoop/hbase/replication/BaseWALEntryFilter.java deleted: hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSMapRUtils.java deleted: hbase-server/src/main/java/org/apache/hadoop/hbase/util/ProtoUtil.java Signed-off-by: Sean Busbey <bus...@apache.org> Signed-off-by: tedyu <yuzhih...@gmail.com> Signed-off-by: Chia-Ping Tsai <chia7...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/842678c9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/842678c9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/842678c9 Branch: refs/heads/branch-2 Commit: 842678c9914dfe64fc762fee552c8216fd44f903 Parents: 1728b48 Author: Umesh Agashe <uaga...@cloudera.com> Authored: Tue Feb 6 16:09:43 2018 -0800 Committer: Chia-Ping Tsai <chia7...@gmail.com> Committed: Sat Mar 10 12:59:48 2018 +0800 ---------------------------------------------------------------------- .../hbase/regionserver/NoOpHeapMemoryTuner.java | 48 --------- .../hbase/replication/BaseWALEntryFilter.java | 29 ------ .../apache/hadoop/hbase/util/FSMapRUtils.java | 46 -------- .../org/apache/hadoop/hbase/util/ProtoUtil.java | 104 ------------------- 4 files changed, 227 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/842678c9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/NoOpHeapMemoryTuner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/NoOpHeapMemoryTuner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/NoOpHeapMemoryTuner.java deleted file mode 100644 index 24cf85c..0000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/NoOpHeapMemoryTuner.java +++ /dev/null @@ -1,48 +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.regionserver; - -import org.apache.yetus.audience.InterfaceAudience; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.regionserver.HeapMemoryManager.TunerContext; -import org.apache.hadoop.hbase.regionserver.HeapMemoryManager.TunerResult; - -/** - * An implementation of HeapMemoryTuner which is not doing any tuning activity but just allows to - * continue with old style fixed proportions. - */ -@InterfaceAudience.Private -public class NoOpHeapMemoryTuner implements HeapMemoryTuner { - - private static final TunerResult NO_OP_TUNER_RESULT = new TunerResult(false); - - @Override - public Configuration getConf() { - return null; - } - - @Override - public void setConf(Configuration conf) { - - } - - @Override - public TunerResult tune(TunerContext context) { - return NO_OP_TUNER_RESULT; - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/842678c9/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/BaseWALEntryFilter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/BaseWALEntryFilter.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/BaseWALEntryFilter.java deleted file mode 100644 index cd062a3..0000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/BaseWALEntryFilter.java +++ /dev/null @@ -1,29 +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.replication; - -import org.apache.hadoop.hbase.HBaseInterfaceAudience; -import org.apache.yetus.audience.InterfaceAudience; - -/** - * A base class WALEntryFilter implementations. Protects against changes in the interface signature. - */ -@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.REPLICATION) -public abstract class BaseWALEntryFilter implements WALEntryFilter { -} http://git-wip-us.apache.org/repos/asf/hbase/blob/842678c9/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSMapRUtils.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSMapRUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSMapRUtils.java deleted file mode 100644 index 2cf3bb9..0000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSMapRUtils.java +++ /dev/null @@ -1,46 +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 java.io.IOException; - -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; -import org.apache.hadoop.fs.permission.FsPermission; - -/** - * <a href="http://www.mapr.com/";>MapR</a> implementation. - */ -@InterfaceAudience.Private -public class FSMapRUtils extends FSUtils { - private static final Logger LOG = LoggerFactory.getLogger(FSMapRUtils.class); - - @Override - public void recoverFileLease(final FileSystem fs, final Path p, - Configuration conf, CancelableProgressable reporter) throws IOException { - LOG.info("Recovering file " + p.toString() + - " by changing permission to readonly"); - FsPermission roPerm = new FsPermission((short) 0444); - fs.setPermission(p, roPerm); - } -} http://git-wip-us.apache.org/repos/asf/hbase/blob/842678c9/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ProtoUtil.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ProtoUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ProtoUtil.java deleted file mode 100644 index 7280b34..0000000 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ProtoUtil.java +++ /dev/null @@ -1,104 +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. - * - * The portion of this file denoted by 'Copied from com.google.protobuf.CodedInputStream' - * is from Protocol Buffers v2.4.1 under the following license - * - * Copyright 2008 Google Inc. All rights reserved. - * http://code.google.com/p/protobuf/ - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Google Inc. nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -package org.apache.hadoop.hbase.util; - -import java.io.DataInput; -import java.io.IOException; - -import org.apache.yetus.audience.InterfaceAudience; - -@InterfaceAudience.Private -public abstract class ProtoUtil { - - /** - * Read a variable length integer in the same format that ProtoBufs encodes. - * @param in the input stream to read from - * @return the integer - * @throws IOException if it is malformed or EOF. - */ - public static int readRawVarint32(DataInput in) throws IOException { - // Copied from com.google.protobuf.CodedInputStream v2.4.1 readRawVarint32 - byte tmp = in.readByte(); - if (tmp >= 0) { - return tmp; - } - int result = tmp & 0x7f; - if ((tmp = in.readByte()) >= 0) { - result |= tmp << 7; - } else { - result |= (tmp & 0x7f) << 7; - if ((tmp = in.readByte()) >= 0) { - result |= tmp << 14; - } else { - result |= (tmp & 0x7f) << 14; - if ((tmp = in.readByte()) >= 0) { - result |= tmp << 21; - } else { - result |= (tmp & 0x7f) << 21; - result |= (tmp = in.readByte()) << 28; - if (tmp < 0) { - // Discard upper 32 bits. - for (int i = 0; i < 5; i++) { - if (in.readByte() >= 0) { - return result; - } - } - throw new IOException("Malformed varint"); - } - } - } - } - return result; - } - // end of copied from protobuf - -}
