Merge pull request #2859 from couchbase/merge-vulcan-try1

Merge vulcan to master branch
couchbase · Aug 20, 2018 · 84795dd · 84795dd
2 parents 2da2f80 + 8901099
commit 84795dd
Show file tree

Hide file tree

Showing 834 changed files with 103,830 additions and 15,605 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,10 @@ temp
 tmp
 *.pdf
 *.swp
+<<<<<<< HEAD
 # ignore WebStorm IDE settings files
-.idea/
+.idea/
+=======
+# Ignore temporary files from IntelliJ editors
+.idea/
+>>>>>>> vulcan
diff --git a/content/admin/picts/TsAndCs01.png b/content/admin/picts/TsAndCs01.png
diff --git a/content/admin/picts/add-server-new2.png b/content/admin/picts/add-server-new2.png
diff --git a/content/admin/picts/auto-compact-defaultNewUI.png b/content/admin/picts/auto-compact-defaultNewUI.png
diff --git a/content/admin/picts/configureNewCluster01.png b/content/admin/picts/configureNewCluster01.png
diff --git a/content/admin/picts/dashboard01.png b/content/admin/picts/dashboard01.png
diff --git a/content/admin/picts/ephemeralBucketsReprovisioningInterface.png b/content/admin/picts/ephemeralBucketsReprovisioningInterface.png
diff --git a/content/admin/picts/joinClusterMemoryQuotaSaved.png b/content/admin/picts/joinClusterMemoryQuotaSaved.png
diff --git a/content/admin/picts/joinClusterServiceCheckboxes.png b/content/admin/picts/joinClusterServiceCheckboxes.png
diff --git a/content/admin/picts/joinExistingNewServiceSettings.png b/content/admin/picts/joinExistingNewServiceSettings.png
diff --git a/content/admin/picts/joinWithCustomConfig.png b/content/admin/picts/joinWithCustomConfig.png
diff --git a/content/admin/picts/joinWithDefaultConfig.png b/content/admin/picts/joinWithDefaultConfig.png
diff --git a/content/admin/picts/registerForUpdates01.png b/content/admin/picts/registerForUpdates01.png
diff --git a/content/admin/picts/reset-quota.png b/content/admin/picts/reset-quota.png
diff --git a/content/admin/picts/setUpNewCluster01.png b/content/admin/picts/setUpNewCluster01.png
diff --git a/content/admin/picts/settings-autofailover.png b/content/admin/picts/settings-autofailover.png
diff --git a/content/admin/picts/ui-cluster.png b/content/admin/picts/ui-cluster.png
diff --git a/content/admin/picts/ui-services.png b/content/admin/picts/ui-services.png
diff --git a/content/admin/picts/web-console.png b/content/admin/picts/web-console.png
diff --git a/content/admin/picts/welcome.png b/content/admin/picts/welcome.png
diff --git a/content/admin/ui-intro.dita b/content/admin/ui-intro.dita
@@ -8,7 +8,7 @@
   environment.</shortdesc>
 
  <body>
-  <p>The redesigned 5.0 interface for Couchbase Server’s Web Console offers a new, modern look on
+  <p>The interface for Couchbase Server’s Web Console offers a new, modern look on
    usability in a browser-based application. Re-designed for intelligence, comfort, and speed, you
    will see a clean new look and experience a streamlined interface to Couchbase’s administration
    and development platform that optimizes your common tasks and workflows.</p>
@@ -43,19 +43,27 @@
       <tbody>
        <row>
         <entry>Data Service</entry>
-        <entry>The number of data nodes that have data service running.</entry>
+        <entry>The number of data nodes that have Data Service running.</entry>
        </row>
        <row>
-        <entry>GSI Service</entry>
-        <entry>The number of data nodes that have Indexer service running.</entry>
+        <entry>Index Service</entry>
+        <entry>The number of data nodes that have the Indexe Service running.</entry>
        </row>
        <row>
         <entry>FTS Service</entry>
-        <entry>The number of data nodes that have full text search (FTS) service running.</entry>
+        <entry>The number of data nodes that have the Full Text Search (FTS) Service running.</entry>
        </row>
        <row>
         <entry>Query Service</entry>
-        <entry>The number of data nodes that have query service running.</entry>
+        <entry>The number of data nodes that have the Query Service running.</entry>
+       </row>
+       <row>
+        <entry>Eventing Service</entry>
+        <entry>The number of data nodes that have the Eventing Service running.</entry>
+       </row>
+       <row>
+        <entry>Analytics Service</entry>
+        <entry>The number of data nodes that have the Analytics Service running.</entry>
        </row>
        <row>
         <entry>XDCR</entry>

diff --git a/content/administrator-guide.ditamap b/content/administrator-guide.ditamap
@@ -16,6 +16,7 @@
 		<topicref href="clustersetup/rebalance.dita"/>
 		<topicref href="clustersetup/rejoin-cluster.dita"/>
 		<topicref href="clustersetup/manage-groups.dita"/>
+		<topicref href="clustersetup/logging.dita"/>
 	</topicref>
 	<topicref href="clustersetup/bucket-setup.dita">
 		<topicref href="clustersetup/create-bucket.dita"/>
@@ -26,6 +27,7 @@
 	<mapref href="indexes/indexing.ditamap"/>
 	<topichead navtitle="Settings">
 	<!--<topicref href="settings/settings.dita">-->
+		<topicref href="settings/backfill.dita"/>
 		<topicref href="settings/cluster-settings.dita"/>
 		<topicref href="settings/update-notificatioin.dita"/>
 		<topicref href="settings/change-failover-settings.dita"/>
@@ -39,6 +41,7 @@
 		<topicref href="xdcr/xdcr-recover-partitions.dita"/>
 		<topicref href="xdcr/xdcr-tuning-performance.dita"/>
 		<topicref href="xdcr/xdcr-managing-security.dita"/>
+		<topicref href="xdcr/xdcr-conflict-resolution.dita"/>
 		<topicref href="xdcr/xdcr-timestamp-based-conflict-resolution.dita"/>
 		<topicref href="install/deployments-xdcr.dita"/>
 	</topicref>

diff --git a/content/analytics/1_intro.html b/content/analytics/1_intro.html
@@ -3,18 +3,17 @@
   <head>
     <meta charset="utf-8">
     <meta description="A introduction for Couchbase Analytics.">
-    <title>Introduction</title>
   </head>
   <body>
     <main role="main"><article role="article" aria-labelledby="ariaid-title1">
     <div class="body">
-      <h1 id="whats-sql">What’s SQL++?</h1>
+      <!-- 1st <h1> removed -->
 
 <p>This document is intended as a reference guide to the full syntax and semantics
 of the SQL++ Query Language, a SQL-inspired language for working with
 semistructured data. SQL++ has much in common with SQL, but there are also
 differences due to the data model that the language is designed to serve. (SQL
-was designed in the 1970’s for interacting with the flat, schema-ified world of
+was designed in the 1970's for interacting with the flat, schema-ified world of
 relational databases, while SQL++ is designed for the nested,
 schema-less/schema-optional world of modern NoSQL systems.) In particular,
 SQL++ in the context of Couchbase Analytics is intended for working with the JSON data model.</p>

diff --git a/content/analytics/2_expr.html b/content/analytics/2_expr.html
@@ -3,12 +3,11 @@
   <head>
     <meta charset="utf-8">
     <meta description="A description of Couchbase Analytics SQL++ expressions.">
-    <title>Expressions</title>
   </head>
   <body>
     <main role="main"><article role="article" aria-labelledby="ariaid-title1">
     <div class="body">
-      <h1 id="expressions">Expressions</h1>
+      <!-- 1st <h1> removed -->
 
 <!--
  ! Licensed to the Apache Software Foundation (ASF) under one
@@ -92,7 +91,7 @@ <h2 id="operator-expressions"><a id="Operator_expressions">Operator Expressions<
       <td>String concatenation</td>
     </tr>
     <tr>
-      <td>IS NULL, IS NOT NULL, IS MISSING, IS NOT MISSING, <br />IS UNKNOWN, IS NOT UNKNOWN</td>
+      <td>IS NULL, IS NOT NULL, IS MISSING, IS NOT MISSING, <br />IS UNKNOWN, IS NOT UNKNOWN, IS VALUED, IS NOT VALUED</td>
       <td>Unknown value comparison</td>
     </tr>
     <tr>
@@ -213,7 +212,7 @@ <h5 id="examples">Examples</h5>
 
 <p>{"name": "Joe"}</p>
 
-<p>The following table enumerates all of SQL++’s comparison operators.</p>
+<p>The following table enumerates all of SQL++'s comparison operators.</p>
 
 <table>
   <thead>
@@ -254,6 +253,16 @@ <h5 id="examples">Examples</h5>
       <td>Test if a value is neither NULL nor MISSING</td>
       <td>SELECT * FROM ChirpMessages cm <br />WHERE cm.user.name IS NOT UNKNOWN;</td>
     </tr>
+    <tr>
+      <td>IS VALUED</td>
+      <td>Test if a value is neither NULL nor MISSING</td>
+      <td>SELECT * FROM ChirpMessages cm <br />WHERE cm.user.name IS VALUED;</td>
+    </tr>
+    <tr>
+      <td>IS NOT VALUED</td>
+      <td>Test if a value is NULL or MISSING</td>
+      <td>SELECT * FROM ChirpMessages cm <br />WHERE cm.user.name IS NOT VALUED;</td>
+    </tr>
     <tr>
       <td>BETWEEN</td>
       <td>Test if a value is between a start value and <br />a end value. The comparison is inclusive <br />to both start and end values.</td>
@@ -355,6 +364,18 @@ <h5 id="examples">Examples</h5>
       <td>FALSE</td>
       <td>FALSE</td>
     </tr>
+    <tr>
+      <td>IS VALUED</td>
+      <td>TRUE</td>
+      <td>FALSE</td>
+      <td>FALSE</td>
+    </tr>
+    <tr>
+      <td>IS NOT VALUED</td>
+      <td>FALSE</td>
+      <td>TRUE</td>
+      <td>TRUE</td>
+    </tr>
   </tbody>
 </table>
 
@@ -525,7 +546,7 @@ <h2 id="quantified-expressions"><a id="Quantified_expressions">Quantified Expres
 set [1, 2, 3] of integers is less than three. The first example yields <code class="highlighter-rouge">FALSE</code> and second example yields <code class="highlighter-rouge">TRUE</code>.</p>
 
 <p>It is useful to note that if the set were instead the empty set, the first expression would yield <code class="highlighter-rouge">TRUE</code> ("every" value in an
-empty set satisfies the condition) while the second expression would yield <code class="highlighter-rouge">FALSE</code> (since there isn’t "some" value, as there are
+empty set satisfies the condition) while the second expression would yield <code class="highlighter-rouge">FALSE</code> (since there isn't "some" value, as there are
 no values in the set, that satisfies the condition).</p>
 
 <p>A quantified expression will return a <code class="highlighter-rouge">NULL</code> (or <code class="highlighter-rouge">MISSING</code>) if the first expression in it evaluates to <code class="highlighter-rouge">NULL</code> (or <code class="highlighter-rouge">MISSING</code>).
@@ -549,7 +570,7 @@ <h2 id="path-expressions"><a id="Path_expressions">Path Expressions</a></h2>
 <p>Components of complex types in the data model are accessed via path expressions. Path access can be applied to the result
 of a SQL++ expression that yields an instance of  a complex type, for example, a object or array instance. For objects,
 path access is based on field names. For arrays, path access is based on (zero-based) array-style indexing.
-SQL++ also supports an "I’m feeling lucky" style index accessor, [?], for selecting an arbitrary element from an array.
+SQL++ also supports an "I'm feeling lucky" style index accessor, [?], for selecting an arbitrary element from an array.
 Attempts to access non-existent fields or out-of-bound array elements produce the special value <code class="highlighter-rouge">MISSING</code>.
 Type errors will be raised for inappropriate use of a path expression, such as applying a field
 accessor to a numeric value.</p>
@@ -650,7 +671,7 @@ <h5 id="examples-3">Examples</h5>
 <h3 id="variable-references"><a id="Variable_references">Variable References</a></h3>
 
 <div class="highlighter-rouge"><pre class="highlight"><code>VariableReference     ::= &lt;IDENTIFIER&gt;|&lt;DelimitedIdentifier&gt;
-&lt;IDENTIFIER&gt;          ::= &lt;LETTER&gt; (&lt;LETTER&gt; | &lt;DIGIT&gt; | "_" | "$")*
+&lt;IDENTIFIER&gt;          ::= (&lt;LETTER&gt; | "_") (&lt;LETTER&gt; | &lt;DIGIT&gt; | "_" | "$")*
 &lt;LETTER&gt;              ::= ["A" - "Z", "a" - "z"]
 DelimitedIdentifier   ::= "`" (&lt;EscapeQuot&gt;
                                 | &lt;EscapeBslash&gt;
@@ -668,7 +689,7 @@ <h3 id="variable-references"><a id="Variable_references">Variable References</a>
 <p>A variable in SQL++ can be bound to any legal data model value. A variable reference refers to the value to which an in-scope variable is
 bound. (E.g., a variable binding may originate from one of the <code class="highlighter-rouge">FROM</code>, <code class="highlighter-rouge">WITH</code> or <code class="highlighter-rouge">LET</code> clauses of a <code class="highlighter-rouge">SELECT</code> statement or from an
 input parameter in the context of a function body.) Backticks, for example, `id`, are used for delimited identifiers. Delimiting is needed when
-a variable’s desired name clashes with a SQL++ keyword or includes characters not allowed in regular identifiers.</p>
+a variable's desired name clashes with a SQL++ keyword or includes characters not allowed in regular identifiers. More information on exactly how variable references are resolved can be found in the appendix section on Variable Resolution.</p>
 
 <h5 id="examples-4">Examples</h5>
 
@@ -722,7 +743,7 @@ <h3 id="constructors"><a id="Constructors">Constructors</a></h3>
 </div>
 
 <p>A major feature of SQL++ is its ability to construct new data model instances. This is accomplished using
-its constructors for each of the model’s complex object structures, namely arrays, multisets, and objects.
+its constructors for each of the model's complex object structures, namely arrays, multisets, and objects.
 Arrays are like JSON arrays, while multisets have bag semantics.
 Objects are built from fields that are field-name/field-value pairs, again like JSON.</p>