This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push: new 1189b81 PHOENIX-6281 : Remove and ignore hbase-compat-1.x from Phoenix 5.x 1189b81 is described below commit 1189b8112c1e846b275c1a010aaba4fd5aea468b Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Sat Dec 26 13:02:35 2020 +0530 PHOENIX-6281 : Remove and ignore hbase-compat-1.x from Phoenix 5.x --- .gitignore | 3 ++ .../coprocessor/CompatIndexRegionObserver.java | 48 ---------------------- .../coprocessor/CompatIndexRegionObserver.java | 40 ------------------ 3 files changed, 3 insertions(+), 88 deletions(-) diff --git a/.gitignore b/.gitignore index 2f47957..85a0b49 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ RESULTS/ CSV_EXPORT/ .DS_Store +phoenix-hbase-compat-1.3.0/ +phoenix-hbase-compat-1.4.0/ +phoenix-hbase-compat-1.5.0/ diff --git a/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java b/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java deleted file mode 100644 index 60858a6..0000000 --- a/phoenix-hbase-compat-1.4.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.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.phoenix.compat.hbase.coprocessor; - -import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.regionserver.wal.WALEdit; -import org.apache.hadoop.hbase.wal.WALKey; - -import java.util.HashMap; -import java.util.Map; - -public class CompatIndexRegionObserver extends BaseRegionObserver { - - public void preWALAppend(ObserverContext<RegionCoprocessorEnvironment> c, WALKey key, - WALEdit edit) { - //no-op implementation for HBase 1.3 and 1.4 that doesn't support this co-proc hook. - } - - public static void appendToWALKey(WALKey key, String attrKey, byte[] attrValue) { - //no-op for HBase 1.3 and 1.4 because we don't have WALKey.addExtendedAttribute(String, - // byte[]) - } - - public static byte[] getAttributeValueFromWALKey(WALKey key, String attrKey) { - return null; - } - - public static Map<String, byte[]> getAttributeValuesFromWALKey(WALKey key) { - return new HashMap<String, byte[]>(); - } -} diff --git a/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java b/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java deleted file mode 100644 index b8eb0a5..0000000 --- a/phoenix-hbase-compat-1.5.0/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java +++ /dev/null @@ -1,40 +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.phoenix.compat.hbase.coprocessor; - -import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; -import org.apache.hadoop.hbase.wal.WALKey; - -import java.util.HashMap; -import java.util.Map; - -public class CompatIndexRegionObserver extends BaseRegionObserver { - - public static void appendToWALKey(WALKey key, String attrKey, byte[] attrValue) { - key.addExtendedAttribute(attrKey, attrValue); - } - - public static byte[] getAttributeValueFromWALKey(WALKey key, String attrKey) { - return key.getExtendedAttribute(attrKey); - } - - public static Map<String, byte[]> getAttributeValuesFromWALKey(WALKey key) { - return new HashMap<String, byte[]>(key.getExtendedAttributes()); - } - -}