forked from apache/phoenix
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PHOENIX-7172: Support HBase 2.6 (apache#1793)
- Loading branch information
1 parent
259b560
commit ce17ec1
Showing
44 changed files
with
1,137 additions
and
187 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 6 additions & 7 deletions
13
...base-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...t-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexHalfStoreFileReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.hbase.io.hfile.CacheConfig; | ||
| import org.apache.hadoop.hbase.io.hfile.HFileInfo; | ||
| import org.apache.hadoop.hbase.io.hfile.ReaderContext; | ||
| import org.apache.hadoop.hbase.regionserver.StoreFileReader; | ||
|
|
||
| public class CompatIndexHalfStoreFileReader extends StoreFileReader { | ||
|
|
||
| public CompatIndexHalfStoreFileReader(final FileSystem fs, final CacheConfig cacheConf, | ||
| final Configuration conf, | ||
| final ReaderContext readerContext, | ||
| final HFileInfo hFileInfo, Path p) throws IOException { | ||
| super(readerContext, hFileInfo, cacheConf, new AtomicInteger(0), conf); | ||
| } | ||
|
|
||
|
|
||
| } |
31 changes: 31 additions & 0 deletions
31
...e-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexedHLogReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader; | ||
| import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec; | ||
|
|
||
| public abstract class CompatIndexedHLogReader extends ProtobufLogReader { | ||
| @Override | ||
| protected void initAfterCompression() throws IOException { | ||
| conf.set(WALCellCodec.WAL_CELL_CODEC_CLASS_KEY, | ||
| "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec"); | ||
| super.initAfterCompression(); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
...2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatLocalIndexStoreFileScanner.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import org.apache.hadoop.hbase.regionserver.StoreFileScanner; | ||
|
|
||
|
|
||
| public class CompatLocalIndexStoreFileScanner extends StoreFileScanner { | ||
|
|
||
| public CompatLocalIndexStoreFileScanner(CompatIndexHalfStoreFileReader reader, | ||
| boolean cacheBlocks, boolean pread, | ||
| boolean isCompaction, long readPt, long scannerOrder, | ||
| boolean canOptimizeForNonNullColumn) { | ||
| super(reader, reader.getScanner(cacheBlocks, pread, isCompaction), !isCompaction, reader | ||
| .getHFileReader().hasMVCCInfo(), readPt, scannerOrder, canOptimizeForNonNullColumn); | ||
| } | ||
|
|
||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 6 additions & 7 deletions
13
...compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.