Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Part of HBASE-1586 Bring back transactions and indexing for 0.20.. plus hbase-1588 Rig our build to support our new contribs -- stargate and THBase/ITHBase 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@789122 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-06-28 16:43:40 +00:00
parent 32c74d5048
commit 184c5c2903
21 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexKeyGenerator.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexNotFoundException.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecification.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

19
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexSpecificationArray.java
View File

@ -1,3 +1,22 @@
/**
* Copyright 2009 The Apache Software Foundation
*
* 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.client.tableindexed; package org.apache.hadoop.hbase.client.tableindexed;
import java.io.DataInput; import java.io.DataInput;

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/IndexedTable.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/SimpleIndexKeyGenerator.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/tableindexed/package.html
View File

@ -2,6 +2,8 @@
<html> <html>
<!-- <!--
Copyright 2009 The Apache Software Foundation
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/transactional/TransactionScannerCallable.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/transactional/TransactionState.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/transactional/UnknownTransactionException.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2008 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/client/transactional/package.html
View File

@ -2,6 +2,8 @@
<html> <html>
<!-- <!--
Copyright 2009 The Apache Software Foundation
Licensed to the Apache Software Foundation (ASF) under one or more Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership. this work for additional information regarding copyright ownership.

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/ipc/TransactionalRegionInterface.java
View File

@ -1,4 +1,6 @@
/** /**
* Copyright 2009 The Apache Software Foundation
*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information

1
src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
View File

@ -53,5 +53,4 @@ class CleanOldTransactionsChore extends Chore {
((TransactionalRegion) region).removeUnNeededCommitedTransactions(); ((TransactionalRegion) region).removeUnNeededCommitedTransactions();
} }
} }
} }

2
src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/THLogRecoveryManager.java
View File

@ -249,6 +249,4 @@ class THLogRecoveryManager {
private TransactionLogger getGlobalTransactionLog() { private TransactionLogger getGlobalTransactionLog() {
return null; return null;
} }
} }

1
src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
View File

@ -338,5 +338,4 @@ class TransactionState {
void incrementCommitPendingWaits() { void incrementCommitPendingWaits() {
this.commitPendingWaits++; this.commitPendingWaits++;
} }
} }

1
src/contrib/transactional/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionServer.java
View File

@ -242,5 +242,4 @@ public class TransactionalRegionServer extends HRegionServer implements
getTransactionalRegion(regionName).put(transactionId, puts); getTransactionalRegion(regionName).put(transactionId, puts);
return puts.length; // ?? return puts.length; // ??
} }
} }

4
src/java/org/apache/hadoop/hbase/HTableDescriptor.java
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2007 The Apache Software Foundation * Copyright 2009 The Apache Software Foundation
* *
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
@ -679,4 +679,4 @@ ISerializable {
public void restSerialize(IRestSerializer serializer) throws HBaseRestException { public void restSerialize(IRestSerializer serializer) throws HBaseRestException {
serializer.serializeTableDescriptor(this); serializer.serializeTableDescriptor(this);
} }
} }

1
src/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java
View File

@ -100,6 +100,7 @@ public class HBaseRPC {
code = addToMap(VersionedProtocol.class, code); code = addToMap(VersionedProtocol.class, code);
code = addToMap(HMasterInterface.class, code); code = addToMap(HMasterInterface.class, code);
code = addToMap(HMasterRegionInterface.class, code); code = addToMap(HMasterRegionInterface.class, code);
code = addToMap(HRegionInterface.class, code);
} }
// End of hbase modifications. // End of hbase modifications.

3
src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java
View File

@ -71,7 +71,8 @@ public interface HBaseRPCProtocolVersion extends VersionedProtocol {
* <li>Version 17: Added incrementColumnValue.</li> * <li>Version 17: Added incrementColumnValue.</li>
* <li>Version 18: HBASE-1302.</li> * <li>Version 18: HBASE-1302.</li>
* <li>Version 19: Added getClusterStatus().</li> * <li>Version 19: Added getClusterStatus().</li>
* <li>Version 20: Backed Transaction HBase out of HBase core.</li>
* </ul> * </ul>
*/ */
public static final long versionID = 19L; public static final long versionID = 20L;
} }

2
src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java
View File

@ -160,4 +160,4 @@ public class HLogKey implements WritableComparable<HLogKey>, HeapSize {
public long heapSize() { public long heapSize() {
return this.regionName.length + this.tablename.length + HEAP_TAX; return this.regionName.length + this.tablename.length + HEAP_TAX;
} }
} }