Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arnej/unify cluster names #1579

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/training-artifacts/101/ch1/ecommerce/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions examples/training-artifacts/101/ch2/ecommerce/services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
purchase.json
Original file line number Diff line number Diff line change
@@ -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/
Original file line number Diff line number Diff line change
@@ -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)
}
}

}
24 changes: 24 additions & 0 deletions examples/training-artifacts/101/ch3/part-purchase/services.xml
Original file line number Diff line number Diff line change
@@ -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">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need "content" here as well?

<min-redundancy>2</min-redundancy>
<documents>
<document type="purchase" mode="index" />
</documents>
<nodes>
<node hostalias="node1" distribution-key="0" />
</nodes>
</content>

</services>

Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down