Skip to content

Commit

Permalink
Update tephra dependency version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@litao-buptsse
litao-buptsse committed Jul 19, 2016
1 parent 2d311da commit f0ff6ba
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 71 deletions.
6 changes: 5 additions & 1 deletion phoenix-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-hbase-compat-1.1</artifactId>
<artifactId>tephra-hbase-compat-1.2-cdh</artifactId>
</dependency>

<!-- Make sure we have all the antlr dependencies -->
Expand Down Expand Up @@ -401,6 +401,10 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-procedure</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
Expand Down
44 changes: 14 additions & 30 deletions phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,16 @@
*/
package org.apache.phoenix.tx;

import static org.apache.phoenix.util.TestUtil.INDEX_DATA_SCHEMA;
import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.apache.phoenix.util.TestUtil.TRANSACTIONAL_DATA_TABLE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;

import java.sql.Connection;
import java.sql.Date;
import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import co.cask.tephra.TransactionContext;
import co.cask.tephra.TransactionSystemClient;
import co.cask.tephra.TxConstants;
import co.cask.tephra.hbase12cdh.TransactionAwareHTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.coprocessor.PhoenixTransactionalProcessor;
import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
Expand All @@ -66,13 +49,14 @@
import org.junit.Ignore;
import org.junit.Test;

import co.cask.tephra.TransactionContext;
import co.cask.tephra.TransactionSystemClient;
import co.cask.tephra.TxConstants;
import co.cask.tephra.hbase11.TransactionAwareHTable;
import java.sql.Connection;
import java.sql.*;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import static org.apache.phoenix.util.TestUtil.*;
import static org.junit.Assert.*;

public class TransactionIT extends BaseHBaseManagedTimeIT {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixTransactionalProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
package org.apache.phoenix.coprocessor;

import co.cask.tephra.hbase11.coprocessor.TransactionProcessor;
import co.cask.tephra.hbase12cdh.coprocessor.TransactionProcessor;

public class PhoenixTransactionalProcessor extends DelegateRegionObserver {

Expand Down
2 changes: 1 addition & 1 deletion phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import co.cask.tephra.TransactionContext;
import co.cask.tephra.TransactionFailureException;
import co.cask.tephra.TransactionSystemClient;
import co.cask.tephra.hbase11.TransactionAwareHTable;
import co.cask.tephra.hbase12cdh.TransactionAwareHTable;
import co.cask.tephra.visibility.FenceWait;
import co.cask.tephra.visibility.VisibilityFence;

Expand Down
44 changes: 12 additions & 32 deletions phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,18 @@
*/
package org.apache.phoenix.index;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;

import co.cask.tephra.Transaction;
import co.cask.tephra.Transaction.VisibilityLevel;
import co.cask.tephra.TxConstants;
import co.cask.tephra.hbase12cdh.TransactionAwareHTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.primitives.Longs;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.hadoop.hbase.client.Mutation;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.*;
import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
Expand Down Expand Up @@ -72,15 +59,8 @@
import org.apache.phoenix.util.SchemaUtil;
import org.apache.phoenix.util.ServerUtil;

import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.google.common.primitives.Longs;

import co.cask.tephra.Transaction;
import co.cask.tephra.Transaction.VisibilityLevel;
import co.cask.tephra.TxConstants;
import co.cask.tephra.hbase11.TransactionAwareHTable;
import java.io.IOException;
import java.util.*;

/**
* Do all the work of managing index updates for a transactional table from a single coprocessor. Since the transaction
Expand Down
7 changes: 3 additions & 4 deletions phoenix-core/src/main/java/org/apache/phoenix/util/TransactionUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@
*/
package org.apache.phoenix.util;

import java.sql.SQLException;

import co.cask.tephra.TransactionConflictException;
import co.cask.tephra.TransactionFailureException;
import co.cask.tephra.TxConstants;
import co.cask.tephra.hbase11.TransactionAwareHTable;

import co.cask.tephra.hbase12cdh.TransactionAwareHTable;
import org.apache.hadoop.hbase.client.HTableInterface;
import org.apache.phoenix.coprocessor.MetaDataProtocol.MetaDataMutationResult;
import org.apache.phoenix.exception.SQLExceptionCode;
Expand All @@ -32,6 +29,8 @@
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.schema.PTable;

import java.sql.SQLException;

public class TransactionUtil {
private TransactionUtil() {
}
Expand Down
14 changes: 12 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<id>cloudera</id>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</repository>
<repository>
<id>sogou.repo</id>
<name>Sogou Repository</name>
<url>http://cloud.sogou-inc.com/nexus/content/groups/public</url>
</repository>
</repositories>

<parent>
Expand Down Expand Up @@ -116,7 +121,7 @@
<joni.version>2.1.2</joni.version>
<calcite.version>1.6.0</calcite.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
<tephra.version>0.7.0</tephra.version>
<tephra.version>sogou-0.7.1</tephra.version>
<spark.version>1.5.2</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
Expand Down Expand Up @@ -556,6 +561,11 @@
<artifactId>hbase-server</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-procedure</artifactId>
<version>${hbase.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
Expand Down Expand Up @@ -683,7 +693,7 @@
</dependency>
<dependency>
<groupId>co.cask.tephra</groupId>
<artifactId>tephra-hbase-compat-1.1</artifactId>
<artifactId>tephra-hbase-compat-1.2-cdh</artifactId>
<version>${tephra.version}</version>
</dependency>

Expand Down

0 comments on commit f0ff6ba

Please sign in to comment.