Merge branch 'release/3.4' into DOC-10837-2

Author: RichardSmedley

modules/howtos/examples/Analytics.java

@@ -17,7 +17,7 @@
  /*
   * You need the following datasets created:
   *
-  *  CREATE DATASET `airports` ON `travel-sample` where `type` = "airport";
+  *  CREATE DATASET `airport` ON `travel-sample` where `type` = "airport";
   *  CREATE DATASET `huge-dataset` ON `travel-sample`;
   *  ALTER COLLECTION `travel-sample`.`inventory`.`airport` ENABLE ANALYTICS;
   *  CONNECT LINK Local;
@@ -86,7 +86,7 @@ public static void main(String... args) {
     {
       // tag::named[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = $country",
+        "select count(*) from airport where country = $country",
         analyticsOptions().parameters(JsonObject.create().put("country", "France")));
       // end::named[]
       show("named", result);
@@ -95,7 +95,7 @@ public static void main(String... args) {
     {
       // tag::positional[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = ?",
+        "select count(*) from airport where country = ?",
         analyticsOptions().parameters(JsonArray.from("France"))
       );
       // end::positional[]
@@ -105,7 +105,7 @@ public static void main(String... args) {
     {
       // tag::scanconsistency[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = 'France'",
+        "select count(*) from airport where country = 'France'",
         analyticsOptions().scanConsistency(AnalyticsScanConsistency.REQUEST_PLUS)
       );
       // end::scanconsistency[]
@@ -115,7 +115,7 @@ public static void main(String... args) {
     {
       // tag::clientcontextid[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = 'France'",
+        "select count(*) from airport where country = 'France'",
         analyticsOptions().clientContextId("user-44" + UUID.randomUUID())
       );
       // end::clientcontextid[]
@@ -125,7 +125,7 @@ public static void main(String... args) {
     {
       // tag::priority[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = 'France'",
+        "select count(*) from airport where country = 'France'",
         analyticsOptions().priority(true)
       );
       // end::priority[]
@@ -135,7 +135,7 @@ public static void main(String... args) {
     {
       // tag::readonly[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select count(*) from airports where country = 'France'",
+        "select count(*) from airport where country = 'France'",
         analyticsOptions().readonly(true)
       );
       // end::readonly[]
@@ -154,7 +154,7 @@ public static void main(String... args) {
     {
       // tag::rowsasobject[]
       AnalyticsResult result = cluster.analyticsQuery(
-        "select * from airports limit 3"
+        "select * from airport limit 3"
       );
       for (JsonObject row : result.rowsAsObject()) {
         System.out.println("Found row: " + row);

modules/test/scripts/init-couchbase/init-buckets.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# ===============================================
+# NOTE: Any changes made to this file will not be 
+# automatically reflected in `make cb-start` as
+# the Makefile does not use the mounted version
+# of this file in the Docker image. You will need
+# to rebuild the image via `make cb-build` before
+# running `make cb-start`.
+# ===============================================
+
 # exit immediately if a command fails or if there are unset vars
 set -euo pipefail
 
@@ -32,9 +41,9 @@ echo "cbimport travel-sample..."
     -b travel-sample \
     -d file:///opt/couchbase/samples/travel-sample.zip
 
-echo "create airports dataset"
+echo "create airport dataset"
 curl --fail -v -u ${CB_USER}:${CB_PSWD} -H "Content-Type: application/json" -d '{
-    "statement": "CREATE DATASET airports ON `travel-sample` WHERE `type`=\"airport\";",
+    "statement": "CREATE DATASET airport ON `travel-sample` WHERE `type`=\"airport\";",
     "pretty":true,
     "client_context_id":"test"
 }' http://${CB_HOST}:8095/analytics/service

modules/test/scripts/init-couchbase/init.sh

@@ -1,5 +1,14 @@
 #!/bin/bash
 
+# ===============================================
+# NOTE: Any changes made to this file will not be 
+# automatically reflected in `make cb-start` as
+# the Makefile does not use the mounted version
+# of this file in the Docker image. You will need
+# to rebuild the image via `make cb-build` before
+# running `make cb-start`.
+# ===============================================
+
 CB_USER="${CB_USER:-Administrator}"
 CB_PSWD="${CB_PSWD:-password}"
 CB_HOST="${CB_HOST:-127.0.0.1}"