Merge pull request #1579 from vespa-engine/arnej/unify-cluster-names

Arnej/unify cluster names
vespa-engine · Nov 19, 2024 · b4ed30d · b4ed30d
2 parents 8e84333 + a6aacbc
commit b4ed30d
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 5 deletions.
diff --git a/examples/training-artifacts/101/ch1/ecommerce/services.xml b/examples/training-artifacts/101/ch1/ecommerce/services.xml
@@ -26,10 +26,10 @@
               The below sets up a client with read permissions.
               Note that the "myToken" token must be created in
               the console before deploying.
-            -->
             <client id="tokenClient" permissions="read,write">
               <token id="myToken"/>
             </client>
+            -->
           </clients>
         <!--
             <document-api> tells the container that it should accept documents for indexing. Through the
@@ -71,7 +71,7 @@
         See:
           - Reference: https://docs.vespa.ai/en/reference/services-content.html
     -->
-    <content id="ecommercetest" version="1.0">
+    <content id="content" version="1.0">
         <min-redundancy>2</min-redundancy>
         <documents>
             <document type="product" mode="index" />

diff --git a/examples/training-artifacts/101/ch2/ecommerce/services.xml b/examples/training-artifacts/101/ch2/ecommerce/services.xml
@@ -26,10 +26,10 @@
               The below sets up a client with read permissions.
               Note that the "myToken" token must be created in
               the console before deploying.
-            -->
             <client id="tokenClient" permissions="read,write">
               <token id="myToken"/>
             </client>
+            -->
           </clients>
         <!--
             <document-api> tells the container that it should accept documents for indexing. Through the
@@ -71,7 +71,7 @@
         See:
           - Reference: https://docs.vespa.ai/en/reference/services-content.html
     -->
-    <content id="ecommercetest" version="1.0">
+    <content id="content" version="1.0">
         <min-redundancy>2</min-redundancy>
         <documents>
             <document type="product" mode="index" />

diff --git a/examples/training-artifacts/101/ch3/part-purchase/.gitignore b/examples/training-artifacts/101/ch3/part-purchase/.gitignore
@@ -0,0 +1 @@
+purchase.json
diff --git a/examples/training-artifacts/101/ch3/part-purchase/.vespaignore b/examples/training-artifacts/101/ch3/part-purchase/.vespaignore
@@ -0,0 +1,6 @@
+# This file excludes unnecessary files from the application package. See
+# https://docs.vespa.ai/en/reference/vespaignore.html for more information.
+.DS_Store
+.gitignore
+README.md
+ext/
diff --git a/examples/training-artifacts/101/ch3/part-purchase/schemas/purchase.sd b/examples/training-artifacts/101/ch3/part-purchase/schemas/purchase.sd
@@ -0,0 +1,35 @@
+# Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+schema purchase {
+
+    document purchase {
+
+        field date type long {
+            indexing: summary | attribute
+        }
+
+        field price type int {
+            indexing: summary | attribute
+        }
+
+        field tax type double {
+            indexing: summary | attribute
+        }
+
+        field item type string {
+            indexing: summary | attribute
+        }
+
+        field customer type string {
+            indexing: summary | attribute
+        }
+
+    }
+
+    rank-profile default {
+        first-phase {
+            expression: attribute(price)
+        }
+    }
+
+}
diff --git a/examples/training-artifacts/101/ch3/part-purchase/services.xml b/examples/training-artifacts/101/ch3/part-purchase/services.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
+<services version="1.0">
+
+  <container id="default" version="1.0">
+    <document-api />
+    <search />
+    <nodes>
+      <node hostalias="node1" />
+    </nodes>
+  </container>
+
+  <content version="1.0">
+    <min-redundancy>2</min-redundancy>
+    <documents>
+      <document type="purchase" mode="index" />
+    </documents>
+    <nodes>
+      <node hostalias="node1" distribution-key="0" />
+    </nodes>
+  </content>
+
+</services>
+
diff --git a/examples/training-artifacts/101/ch5/embedder_rrf_rag/services.xml b/examples/training-artifacts/101/ch5/embedder_rrf_rag/services.xml
@@ -57,7 +57,7 @@
     </container>
 
     <!-- See https://docs.vespa.ai/en/reference/services-content.html -->
-    <content id="text" version="1.0">
+    <content id="content" version="1.0">
         <min-redundancy>2</min-redundancy>
         <documents>
             <document type="product" mode="index" />