Skip to content

Commit

Permalink
Revert "HBASE-25713 Make an hbase-wal module"
Browse files Browse the repository at this point in the history
This reverts commit e58f1b2.
  • Loading branch information
saintstack committed Mar 31, 2021
1 parent d90d0c2 commit b051ad5
Show file tree
Hide file tree
Showing 29 changed files with 244 additions and 328 deletions.
4 changes: 0 additions & 4 deletions hbase-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-coprocessor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* 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
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
Expand All @@ -22,8 +23,10 @@
/**
* Interface to support the aborting of a given server or client.
* <p>
* This is used primarily when we could get an unexpected and fatal exception; abort is called to
* exit the hosting process.
* This is used primarily for ZooKeeper usage when we could get an unexpected
* and fatal exception, requiring an abort.
* <p>
* Implemented by the Master, RegionServer, and TableServers (client).
*/
@InterfaceAudience.Private
public interface Abortable {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
*/

package org.apache.hadoop.hbase;
import com.google.protobuf.Service;

import java.io.IOException;
import java.util.Collections;

import com.google.protobuf.Service;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;

Expand Down Expand Up @@ -95,8 +97,8 @@ default void stop(CoprocessorEnvironment env) throws IOException {}

/**
* Coprocessor endpoints providing protobuf services should override this method.
* @return Iterable of {@link Service}s or empty collection; implementations should not return
* null.
* @return Iterable of {@link Service}s or empty collection. Implementations should never
* return null.
*/
default Iterable<Service> getServices() {
return Collections.EMPTY_SET;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/**
*
* 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
Expand All @@ -20,7 +21,8 @@
import org.apache.yetus.audience.InterfaceAudience;

/**
* Subclass if exception is not meant to be retried.
* Subclass if exception is not meant to be retried: e.g.
* {@link org.apache.hadoop.hbase.UnknownScannerException}
*/
@InterfaceAudience.Public
public class DoNotRetryIOException extends HBaseIOException {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/**
*
* 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
Expand All @@ -25,22 +26,28 @@
*/
@InterfaceAudience.Public
public class CoprocessorException extends DoNotRetryIOException {
private static final long serialVersionUID = 4357922136679804887L;

/** Default Constructor */
public CoprocessorException() {
super();
}

/**
* Constructor with a Class object and exception message.
* @param clazz
* @param s
*/
public CoprocessorException(Class<?> clazz, String s) {
super("Coprocessor [" + clazz.getName() + "]: " + s);
super( "Coprocessor [" + clazz.getName() + "]: " + s);
}

/**
* Constructs the exception and supplies a string as the message
* @param s - message
*/
public CoprocessorException(String s) {
super(s);
}

}
102 changes: 0 additions & 102 deletions hbase-coprocessor/pom.xml

This file was deleted.

4 changes: 0 additions & 4 deletions hbase-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -256,10 +256,6 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-coprocessor</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-http</artifactId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
*
* 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
Expand All @@ -18,7 +19,6 @@

package org.apache.hadoop.hbase.coprocessor;

import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
Expand All @@ -27,6 +27,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;

/**
* Encapsulation of the environment of each coprocessor
*/
Expand All @@ -35,21 +37,21 @@ public class BaseEnvironment<C extends Coprocessor> implements CoprocessorEnviro
private static final Logger LOG = LoggerFactory.getLogger(BaseEnvironment.class);

/** The coprocessor */
protected final C impl;
public C impl;
/** Chaining priority */
protected int priority = Coprocessor.PRIORITY_USER;
/** Current coprocessor state */
Coprocessor.State state = Coprocessor.State.UNINSTALLED;
private final int seq;
private final Configuration conf;
private final ClassLoader classLoader;
private int seq;
private Configuration conf;
private ClassLoader classLoader;

/**
* Constructor
* @param impl the coprocessor instance
* @param priority chaining priority
*/
public BaseEnvironment(C impl, final int priority, int seq, Configuration conf) {
public BaseEnvironment(final C impl, final int priority, final int seq, final Configuration conf) {
this.impl = impl;
this.classLoader = impl.getClass().getClassLoader();
this.priority = priority;
Expand Down
Loading

0 comments on commit b051ad5

Please sign in to comment.