OMID-168 cleanup the example code using HBase 0.x and yahoo imports

Author: chia7712

doc/site/markdown/basic-examples.md

@@ -214,12 +214,17 @@ The following example summarizes the steps described above.
 
 ```java
 
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
+import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.Put;
+import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.util.Bytes;
-import com.yahoo.omid.transaction.HBaseTransactionManager;
-import com.yahoo.omid.transaction.TTable;
-import com.yahoo.omid.transaction.Transaction;
-import com.yahoo.omid.transaction.TransactionManager;
+import org.apache.omid.transaction.HBaseTransactionManager;
+import org.apache.omid.transaction.RollbackException;
+import org.apache.omid.transaction.TTable;
+import org.apache.omid.transaction.Transaction;
+import org.apache.omid.transaction.TransactionManager;
 
 public class Example {
 
@@ -232,14 +237,15 @@ public class Example {
     public static void main(String[] args) throws Exception {
 
         try (TransactionManager tm = HBaseTransactionManager.newInstance();
-             TTable txTable = new TTable("EXAMPLE_TABLE")) {
+             Connection conn = ConnectionFactory.createConnection();
+             TTable txTable = new TTable(conn, "EXAMPLE_TABLE")) {
 
             Transaction tx = tm.begin();
-            System.out.printl("Transaction started");
+            System.out.println("Transaction started");
 
             // Retrieve data transactionally
             Get get = new Get(exampleRow);
-            get.add(family, qualifier);
+            get.addColumn(family, qualifier);
             Result txGetResult = txTable.get(tx, get);
             byte[] retrievedValue = txGetResult.getValue(family, qualifier);
 
@@ -253,8 +259,8 @@ public class Example {
             // Otherwise, add a value in other column and try to commit the transaction
             try {
                 Put putOnRow = new Put(exampleRow);
-                putOnRow.add(family, qualifier, dataValue);
-        	    txTable.put(tx, putOnRow);
+                putOnRow.addColumn(family, qualifier, dataValue);
+                txTable.put(tx, putOnRow);
                 tm.commit(tx);
                 System.out.println("Transaction committed. New value written to example row");
             } catch(RollbackException e) {

doc/site/markdown/quickstart.md

@@ -85,9 +85,9 @@ pom.xml file:
 
 ```xml
 <dependency>
-   <groupId>com.yahoo.omid</groupId>
-   <artifactId>hbase-client</artifactId>
-   <version>${hbase_client.version}</version>
+   <groupId>org.apache.omid</groupId>
+   <artifactId>omid-hbase-client-hbase1.x</artifactId>
+   <version>1.0.1</version>
 </dependency>
 ```
 
@@ -109,12 +109,15 @@ different rows of a table in a transactional context, but is enough to show how
 detailed explanation of the client interfaces can be found in the [Basic Examples](basic-examples.html) section.
 
 ```java
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.util.Bytes;
-import com.yahoo.omid.transaction.HBaseTransactionManager;
-import com.yahoo.omid.transaction.TTable;
-import com.yahoo.omid.transaction.Transaction;
-import com.yahoo.omid.transaction.TransactionManager;
+import org.apache.omid.transaction.HBaseTransactionManager;
+import org.apache.omid.transaction.TTable;
+import org.apache.omid.transaction.Transaction;
+import org.apache.omid.transaction.TransactionManager;
+import org.testng.annotations.Test;
 
 public class OmidExample {
 
@@ -124,16 +127,17 @@ public class OmidExample {
     public static void main(String[] args) throws Exception {
 
         try (TransactionManager tm = HBaseTransactionManager.newInstance();
-             TTable txTable = new TTable("MY_TX_TABLE")) {
+             Connection conn = ConnectionFactory.createConnection();
+             TTable txTable = new TTable(conn, "MY_TX_TABLE")) {
 
             Transaction tx = tm.begin();
 
             Put row1 = new Put(Bytes.toBytes("EXAMPLE_ROW1"));
-            row1.add(family, qualifier, Bytes.toBytes("val1"));
+            row1.addColumn(family, qualifier, Bytes.toBytes("val1"));
             txTable.put(tx, row1);
 
             Put row2 = new Put(Bytes.toBytes("EXAMPLE_ROW2"));
-            row2.add(family, qualifier, Bytes.toBytes("val2"));
+            row2.addColumn(family, qualifier, Bytes.toBytes("val2"));
             txTable.put(tx, row2);
 
             tm.commit(tx);
@@ -153,19 +157,32 @@ the application code by creating an instance of the `HBaseOmidClientConfiguratio
 creation of the transaction manager:
 
 ```java
-    import com.yahoo.omid.transaction.HBaseOmidClientConfiguration;
-
-    ...
-    
-    HBaseOmidClientConfiguration omidClientConfiguration = new HBaseOmidClientConfiguration();
-    omidClientConfiguration.setConnectionType(DIRECT);
-    omidClientConfiguration.setConnectionString("my_tso_server_host:54758");
-    omidClientConfiguration.setRetryDelayMs(3000);
+    import org.apache.hadoop.hbase.client.Connection;
+    import org.apache.hadoop.hbase.client.ConnectionFactory;
+    import org.apache.hadoop.hbase.util.Bytes;
+    import org.apache.omid.transaction.HBaseOmidClientConfiguration;
+    import org.apache.omid.transaction.HBaseTransactionManager;
+    import org.apache.omid.transaction.TTable;
+    import org.apache.omid.transaction.TransactionManager;
+    import org.apache.omid.tso.client.OmidClientConfiguration;
+
+    public class OmidExample {
+        
+        public static void main(String[] args) throws Exception {
+            HBaseOmidClientConfiguration omidClientConfiguration = new HBaseOmidClientConfiguration();
+            omidClientConfiguration.setConnectionType(OmidClientConfiguration.ConnType.DIRECT);
+            omidClientConfiguration.setConnectionString("my_tso_server_host:54758");
+            omidClientConfiguration.setRetryDelayInMs(3000);
 
-    try (TransactionManager tm = HBaseTransactionManager.newInstance(omidClientConfiguration);
-             TTable txTable = new TTable("MY_TX_TABLE")) {
-    
-    ...
+            try (TransactionManager tm = HBaseTransactionManager.newInstance(omidClientConfiguration);
+                 Connection conn = ConnectionFactory.createConnection();
+                 TTable txTable = new TTable(conn, "MY_TX_TABLE")) {
+                
+            }
+        }
+
+    }
+
 ```
 
 Also, you will need to create a HBase table "MY_TX_TABLE", with column family "MY_CF", and with `TTL` disabled and

pom.xml

@@ -170,7 +170,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- 3rd-Party Library Versioning -->
-        <hbase0.version>0.98.10.1-hadoop1</hbase0.version>
         <hbase1.version>1.3.1</hbase1.version>
         <hbase2.version>2.0.1</hbase2.version>
         <hadoop1.version>2.7.5</hadoop1.version>