resolve merge conflicts

Author: Joseph Lowinske

CONTRIBUTING.md

@@ -1154,6 +1154,12 @@
           }
         ]
       },
+      {
+        "title": "Performance Benchmarking with TPC-C",
+        "urls": [
+          "/${VERSION}/performance-benchmarking-with-tpc-c.html"
+        ]
+      },  
       {
         "title": "Access Management",
         "items": [

_includes/expand.html

@@ -282,6 +282,12 @@
               }
             ]
           },
+          {
+            "title": "Performance Benchmarking with TPC-C",
+            "urls": [
+              "/${VERSION}/performance-benchmarking-with-tpc-c.html"
+            ]
+          },        
           {
             "title": "Access Management",
             "items": [
@@ -328,7 +334,7 @@
               },
               {
                 "title": "Encryption at Rest",
-                "ursl": [
+                "urls": [
                   "/${VERSION}/encryption.html"
                 ]
               },

_includes/sidebar-data-v2.0.json

@@ -28,10 +28,13 @@
 		<span class="blue-arrow blue-arrow--down"></span>
 		Resources
 		<div class="mobile-sub-nav">
-			<a href="https://www.cockroachlabs.com/guides/">Guides</a>
-			<a href="https://www.cockroachlabs.com/docs/stable/training">Training</a>
-			<a href="https://www.cockroachlabs.com/community/tech-talks/">Tech Talks</a>
-			<a href="https://forum.cockroachlabs.com/">Forum</a>
+				<span>Spotlights</span>
+				<ul class="mobile-sub-nav--link-list">
+					<li><a href="https://www.cockroachlabs.com/campaigns/kubernetes/">How to Run CockroachDB on Kubernetes</a></li>
+				</ul>
+				<a href="https://www.cockroachlabs.com/guides/">Guides</a>
+				<a href="https://www.cockroachlabs.com/docs/stable/training/">Training</a>
+				<a href="https://forum.cockroachlabs.com/">Forum</a>
 		</div>
 	</div>
 	<a href="https://www.cockroachlabs.com/blog/" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-depth-0">Blog</a>
@@ -41,26 +44,26 @@
 <header class="navbar-fixed-top">
 	<div class="navbar-fixed-top--inner">
 		<a class="logo" href="https://www.cockroachlabs.com/" title="Cockroach Labs">
-				<img src="{{ 'images/CL_Logo_Horizontal.svg' | relative_url }}" width="100%" alt="Cockroach Labs" />
+			<img src="{{ 'images/CL_Logo_Horizontal.svg' | relative_url }}" width="100%" alt="Cockroach Labs" />
 		</a>
-	
+
 		<nav class="desktop" role="navigation">
 			<div class='menu-item-dropdown'>
 				Product
 				<div class="menu-dropdown">
-					<a href="/product/cockroachdb/" data-proofer-ignore>
+					<a href="https://www.cockroachlabs.com/product/cockroachdb/" data-proofer-ignore>
 						<div class="menu-dropdown__title">CockroachDB</div>
 						<div class="menu-dropdown__info">The SQL database for global cloud services.</div>
 					</a>
-					<a href="/solutions/automated-operation/" data-proofer-ignore>
+					<a href="https://www.cockroachlabs.com/solutions/automated-operation/" data-proofer-ignore>
 						<div class="menu-dropdown__title">Automated Operation</div>
 						<div class="menu-dropdown__info">Automate tasks like scaling, replication, and recovery.</div>
 					</a>
-					<a href="/solutions/global-clusters/" data-proofer-ignore>
+					<a href="https://www.cockroachlabs.com/solutions/global-clusters/" data-proofer-ignore>
 						<div class="menu-dropdown__title">Global Clusters</div>
 						<div class="menu-dropdown__info">Scale your infrastructure across datacenters and regions.</div>
 					</a>
-					<a href="/pricing/" data-proofer-ignore>
+					<a href="https://www.cockroachlabs.com/pricing/" data-proofer-ignore>
 						<div class="menu-dropdown__title">Pricing</div>
 					</a>
 					<a href="{{ "/stable/frequently-asked-questions.html" | relative_url }}" data-proofer-ignore>
@@ -73,23 +76,20 @@
 			<div class='menu-item-dropdown'>
 				<div class="menu-item-dropdown__parent-link">Resources</div>
 				<div class="menu-dropdown">
-					<a href="https://www.cockroachlabs.com/guides/" data-proofer-ignore>
-						<div class="menu-dropdown__title">Guides</div>
-						<div class="menu-dropdown__info">Comprehensive guides about distributed technology.</div>
-					</a>
-					<a href="https://www.cockroachlabs.com/docs/stable/training" data-proofer-ignore>
-						<div class="menu-dropdown__title">Training</div>
-						<div class="menu-dropdown__info">E-learnings on CockroachDB fundamentals.</div>
-					</a>
-					<a href="https://www.cockroachlabs.com/community/tech-talks/" data-proofer-ignore>
-						<div class="menu-dropdown__title">Tech Talks</div>
-						<div class="menu-dropdown__info">Videos and slides explaining how CockroachDB works.</div>
-					</a>
-					<a href="https://forum.cockroachlabs.com/" data-proofer-ignore>
-						<div class="menu-dropdown__title">Forum</div>
-						<div class="menu-dropdown__info">Need help? Ask questions on the developer forum.</div>
-					</a>
-				</div>
+						<div class="menu-dropdown--subsection">
+							<span class="menu-dropdown--subsection__title">Spotlights</span>
+							<a class="menu-dropdown--subsection__link" href="https://www.cockroachlabs.com/campaigns/kubernetes/">How to Run CockroachDB on Kubernetes</a>
+						</div>
+						<a href="https://www.cockroachlabs.com/guides/">
+							<div class="menu-dropdown__title">Guides</div>
+						</a>
+						<a href="https://www.cockroachlabs.com/docs/stable/training/" data-proofer-ignore>
+							<div class="menu-dropdown__title">Training</div>
+						</a>
+						<a href="https://forum.cockroachlabs.com/">
+							<div class="menu-dropdown__title">Forum</div>
+						</a>
+					</div>
 			</div>
 			<a href="https://www.cockroachlabs.com/blog/" class='blog-nav' data-proofer-ignore>Blog</a>
 			<a href="{{ "/stable/install-cockroachdb.html" | relative_url }}" class="button--header menu-item" data-proofer-ignore>Download</a>

_includes/sidebar-data-v2.1.json

@@ -0,0 +1,34 @@
+import java.sql.*;
+
+/*
+You can compile and run this example with a command like:
+  javac BasicSample.java && java -cp .:~/path/to/postgresql-9.4.1208.jar BasicSample
+You can download the postgres JDBC driver jar from https://jdbc.postgresql.org.
+*/
+public class BasicSample {
+    public static void main(String[] args) throws ClassNotFoundException, SQLException {
+        // Load the postgres JDBC driver.
+        Class.forName("org.postgresql.Driver");
+
+        // Connect to the "bank" database.
+        Connection db = DriverManager.getConnection("jdbc:postgresql://127.0.0.1:26257/bank?sslmode=disable", "maxroach", "");
+
+        try {
+            // Create the "accounts" table.
+            db.createStatement().execute("CREATE TABLE IF NOT EXISTS accounts (id INT PRIMARY KEY, balance INT)");
+
+            // Insert two rows into the "accounts" table.
+            db.createStatement().execute("INSERT INTO accounts (id, balance) VALUES (1, 1000), (2, 250)");
+
+            // Print out the balances.
+            System.out.println("Initial balances:");
+            ResultSet res = db.createStatement().executeQuery("SELECT id, balance FROM accounts");
+            while (res.next()) {
+                System.out.printf("\taccount %s: %s\n", res.getInt("id"), res.getInt("balance"));
+            }
+        } finally {
+            // Close the database connection.
+            db.close();
+        }
+    }
+}

_includes/topnav.html

@@ -0,0 +1,113 @@
+import java.sql.*;
+
+/*
+  You can compile and run this example with a command like:
+  javac TxnSample.java && java -cp .:~/path/to/postgresql-9.4.1208.jar TxnSample
+  You can download the postgres JDBC driver jar from https://jdbc.postgresql.org.
+*/
+
+// Ambiguous whether the transaction committed or not.
+class AmbiguousCommitException extends SQLException{
+    public AmbiguousCommitException(Throwable cause) {
+        super(cause);
+    }
+}
+class InsufficientBalanceException extends Exception {}
+class AccountNotFoundException extends Exception {
+    public int account;
+    public AccountNotFoundException(int account) {
+        this.account = account;
+    }
+}
+
+// A simple interface that provides a retryable lambda expression.
+interface RetryableTransaction {
+    public void run(Connection conn)
+        throws SQLException, InsufficientBalanceException, AccountNotFoundException, AmbiguousCommitException;
+}
+
+public class TxnSample {
+    public static RetryableTransaction transferFunds(int from, int to, int amount) {
+        return new RetryableTransaction() {
+            public void run(Connection conn)
+                throws SQLException, InsufficientBalanceException, AccountNotFoundException, AmbiguousCommitException {
+                // Check the current balance.
+                ResultSet res = conn.createStatement().executeQuery("SELECT balance FROM accounts WHERE id = " + from);
+                if(!res.next()) {
+                    throw new AccountNotFoundException(from);
+                }
+                int balance = res.getInt("balance");
+                if(balance < from) {
+                    throw new InsufficientBalanceException();
+                }
+                // Perform the transfer.
+                conn.createStatement().executeUpdate("UPDATE accounts SET balance = balance - " + amount + " where id = " + from);
+                conn.createStatement().executeUpdate("UPDATE accounts SET balance = balance + " + amount + " where id = " + to);
+            }
+        };
+    }
+
+    public static void retryTransaction(Connection conn, RetryableTransaction tx)
+        throws SQLException, InsufficientBalanceException, AccountNotFoundException, AmbiguousCommitException {
+        Savepoint sp = conn.setSavepoint("cockroach_restart");
+        while(true) {
+            boolean releaseAttempted = false;
+            try {
+                tx.run(conn);
+                releaseAttempted = true;
+                conn.releaseSavepoint(sp);
+            }
+            catch(SQLException e) {
+                String sqlState = e.getSQLState();
+                // Check if the error code indicates a SERIALIZATION_FAILURE.
+                if(sqlState.equals("40001")) {
+                    // Signal the database that we will attempt a retry.
+                    conn.rollback(sp);
+                    continue;
+                } else if(releaseAttempted) {
+                    throw new AmbiguousCommitException(e);
+                } else {
+                    throw e;
+                }
+            }
+            break;
+        }
+        conn.commit();
+    }
+
+    public static void main(String[] args) throws ClassNotFoundException, SQLException {
+        // Load the postgres JDBC driver.
+        Class.forName("org.postgresql.Driver");
+
+        // Connect to the "bank" database.
+        Connection db = DriverManager.getConnection("jdbc:postgresql://127.0.0.1:26257/bank?sslmode=disable", "maxroach", "");
+            try {
+                // We need to turn off autocommit mode to allow for
+                // multi-statement transactions.
+                db.setAutoCommit(false);
+                // Perform the transfer. This assumes the table has
+                // already been set up as in the "Build a Test App"
+                // tutorial.
+                RetryableTransaction transfer = transferFunds(1, 2, 100);
+                retryTransaction(db, transfer);
+
+                // Check balances after transfer.
+                db.setAutoCommit(true);
+                ResultSet res = db.createStatement().executeQuery("SELECT id, balance FROM accounts");
+                while (res.next()) {
+                    System.out.printf("\taccount %s: %s\n", res.getInt("id"), res.getInt("balance"));
+                }
+            } catch(InsufficientBalanceException e) {
+                System.out.println("Insufficient balance");
+            } catch(AccountNotFoundException e) {
+                System.out.println("No users in the table with id " + e.account);
+            } catch(AmbiguousCommitException e) {
+                System.out.println("Ambiguous result encountered: " + e);
+            } catch(SQLException e) {
+                System.out.println("SQLException encountered:" + e);
+            } finally {
+                // Close the database connection.
+                db.close();
+            }
+    }
+}

_includes/app/BasicSample.java renamed to _includes/v1.0/app/BasicSample.java

@@ -0,0 +1,45 @@
+require 'active_record'
+require 'pg'
+require 'activerecord-cockroachdb-adapter'
+
+# Connect to CockroachDB through ActiveRecord.
+# In Rails, this configuration would go in config/database.yml as usual.
+ActiveRecord::Base.establish_connection(
+  adapter:  'cockroachdb',
+  username: 'maxroach',
+  password: '',
+  database: 'bank',
+  host:     'localhost',
+  port:     26257,
+)
+
+
+# Define the Account model.
+# In Rails, this would go in app/models/ as usual.
+class Account < ActiveRecord::Base
+  validates :id, presence: true
+  validates :balance, presence: true
+end
+
+# Define a migration for the accounts table.
+# In Rails, this would go in db/migrate/ as usual.
+class Schema < ActiveRecord::Migration
+  def change
+    create_table :accounts, force: true do |t|
+      t.integer :balance
+    end
+  end
+end
+
+# Run the schema migration by hand.
+# In Rails, this would be done via rake db:migrate as usual.
+Schema.new.change()
+
+# Create two accounts, inserting two rows into the accounts table.
+Account.create(id: 1, balance: 1000)
+Account.create(id: 2, balance: 250)
+
+# Retrieve accounts and print out the balances
+Account.all.each do |acct|
+  puts "#{acct.id} #{acct.balance}"
+end