This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch clean-up
in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb.git
commit 343e42eb359c030631f0c32ff86f6cde348665fa
Author: Gao Hongtao <hanahm...@gmail.com>
AuthorDate: Sun Apr 7 05:38:50 2024 +0000
Update non-go files
Signed-off-by: Gao Hongtao <hanahm...@gmail.com>
---
banyand/metadata/schema/testdata/group.json | 4 -
.../schema/testdata/index_rules/db.instance.json | 1 -
.../schema/testdata/index_rules/db.type.json | 1 -
.../schema/testdata/index_rules/duration.json | 3 +-
.../schema/testdata/index_rules/endpoint_id.json | 1 -
.../schema/testdata/index_rules/http.method.json | 1 -
.../schema/testdata/index_rules/mq.broker.json | 1 -
.../schema/testdata/index_rules/mq.queue.json | 1 -
.../schema/testdata/index_rules/mq.topic.json | 1 -
.../schema/testdata/index_rules/status_code.json | 1 -
.../schema/testdata/index_rules/trace_id.json | 3 +-
bydbctl/internal/cmd/group_test.go | 9 -
bydbctl/internal/cmd/index_rule_binding_test.go | 3 -
bydbctl/internal/cmd/index_rule_test.go | 12 +-
bydbctl/internal/cmd/measure_test.go | 3 -
bydbctl/internal/cmd/stream_test.go | 3 -
dist/LICENSE | 7 +-
.../license-github.com-SkyAPM-badger-v3.txt | 176 ------------------
.../license-github.com-dgraph-io-ristretto.txt | 176 ------------------
dist/licenses/license-github.com-golang-glog.txt | 191 -------------------
.../license-github.com-golang-groupcache.txt | 191 -------------------
.../license-github.com-google-flatbuffers.txt | 202 ---------------------
.../license-github.com-spaolacci-murmur3.txt | 24 +++
dist/licenses/license-go.opencensus.io.txt | 202 ---------------------
docs/concept/data-model.md | 10 +-
docs/crud/group.md | 6 -
docs/crud/index_rule.md | 9 +-
docs/crud/index_rule_binding.md | 3 -
docs/crud/measure/schema.md | 3 -
docs/crud/stream/schema.md | 3 -
pkg/test/measure/testdata/groups/sw_metric.json | 4 -
pkg/test/measure/testdata/index_rules/id.json | 1 -
pkg/test/measure/testdata/index_rules/layer.json | 1 -
.../testdata/index_rules/searchable_name.json | 1 -
.../measure/testdata/index_rules/service_id.json | 1 -
pkg/test/stream/testdata/group.json | 4 -
.../stream/testdata/index_rules/db.instance.json | 1 -
pkg/test/stream/testdata/index_rules/db.type.json | 1 -
pkg/test/stream/testdata/index_rules/duration.json | 3 +-
.../stream/testdata/index_rules/endpoint_id.json | 1 -
.../stream/testdata/index_rules/extended_tags.json | 1 -
.../stream/testdata/index_rules/http.method.json | 1 -
.../stream/testdata/index_rules/mq.broker.json | 1 -
pkg/test/stream/testdata/index_rules/mq.queue.json | 1 -
pkg/test/stream/testdata/index_rules/mq.topic.json | 1 -
.../stream/testdata/index_rules/status_code.json | 1 -
pkg/test/stream/testdata/index_rules/trace_id.json | 3 +-
.../index-rules/measure-default-index-rule.yaml | 30 +--
.../index-rules/measure-minute-index-rule.yaml | 13 +-
ui/src/components/IndexRule/Editor.vue | 32 ----
ui/src/components/IndexRule/index.vue | 3 -
51 files changed, 38 insertions(+), 1318 deletions(-)
diff --git a/banyand/metadata/schema/testdata/group.json
b/banyand/metadata/schema/testdata/group.json
index e200d011..ac044783 100644
--- a/banyand/metadata/schema/testdata/group.json
+++ b/banyand/metadata/schema/testdata/group.json
@@ -5,10 +5,6 @@
"catalog": "CATALOG_STREAM",
"resource_opts": {
"shard_num": 2,
- "block_interval": {
- "unit": "UNIT_HOUR",
- "num": 2
- },
"segment_interval": {
"unit": "UNIT_DAY",
"num": 1
diff --git a/banyand/metadata/schema/testdata/index_rules/db.instance.json
b/banyand/metadata/schema/testdata/index_rules/db.instance.json
index d6bcbb10..8f2068a4 100644
--- a/banyand/metadata/schema/testdata/index_rules/db.instance.json
+++ b/banyand/metadata/schema/testdata/index_rules/db.instance.json
@@ -8,6 +8,5 @@
"db.instance"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/db.type.json
b/banyand/metadata/schema/testdata/index_rules/db.type.json
index b13adedc..f23fd03f 100644
--- a/banyand/metadata/schema/testdata/index_rules/db.type.json
+++ b/banyand/metadata/schema/testdata/index_rules/db.type.json
@@ -8,6 +8,5 @@
"db.type"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/duration.json
b/banyand/metadata/schema/testdata/index_rules/duration.json
index 96e2cc62..baae3592 100644
--- a/banyand/metadata/schema/testdata/index_rules/duration.json
+++ b/banyand/metadata/schema/testdata/index_rules/duration.json
@@ -7,7 +7,6 @@
"tags": [
"duration"
],
- "type": "TYPE_TREE",
- "location": "LOCATION_SERIES",
+ "type": "TYPE_INVERTED",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/endpoint_id.json
b/banyand/metadata/schema/testdata/index_rules/endpoint_id.json
index 7625890f..89272177 100644
--- a/banyand/metadata/schema/testdata/index_rules/endpoint_id.json
+++ b/banyand/metadata/schema/testdata/index_rules/endpoint_id.json
@@ -8,6 +8,5 @@
"endpoint_id"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/http.method.json
b/banyand/metadata/schema/testdata/index_rules/http.method.json
index b27c103c..b6ce4e9b 100644
--- a/banyand/metadata/schema/testdata/index_rules/http.method.json
+++ b/banyand/metadata/schema/testdata/index_rules/http.method.json
@@ -8,6 +8,5 @@
"http.method"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/mq.broker.json
b/banyand/metadata/schema/testdata/index_rules/mq.broker.json
index 1edfe6ec..95180828 100644
--- a/banyand/metadata/schema/testdata/index_rules/mq.broker.json
+++ b/banyand/metadata/schema/testdata/index_rules/mq.broker.json
@@ -8,6 +8,5 @@
"mq.broker"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/mq.queue.json
b/banyand/metadata/schema/testdata/index_rules/mq.queue.json
index 455d712c..de4aa2eb 100644
--- a/banyand/metadata/schema/testdata/index_rules/mq.queue.json
+++ b/banyand/metadata/schema/testdata/index_rules/mq.queue.json
@@ -8,6 +8,5 @@
"mq.queue"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/mq.topic.json
b/banyand/metadata/schema/testdata/index_rules/mq.topic.json
index 57702890..c292a582 100644
--- a/banyand/metadata/schema/testdata/index_rules/mq.topic.json
+++ b/banyand/metadata/schema/testdata/index_rules/mq.topic.json
@@ -8,6 +8,5 @@
"mq.topic"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/status_code.json
b/banyand/metadata/schema/testdata/index_rules/status_code.json
index 94367a79..dcf04473 100644
--- a/banyand/metadata/schema/testdata/index_rules/status_code.json
+++ b/banyand/metadata/schema/testdata/index_rules/status_code.json
@@ -8,6 +8,5 @@
"status_code"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/banyand/metadata/schema/testdata/index_rules/trace_id.json
b/banyand/metadata/schema/testdata/index_rules/trace_id.json
index b7bb2d2b..add7fc33 100644
--- a/banyand/metadata/schema/testdata/index_rules/trace_id.json
+++ b/banyand/metadata/schema/testdata/index_rules/trace_id.json
@@ -7,7 +7,6 @@
"tags": [
"trace_id"
],
- "type": "TYPE_TREE",
- "location": "LOCATION_GLOBAL",
+ "type": "TYPE_INVERTED",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/bydbctl/internal/cmd/group_test.go
b/bydbctl/internal/cmd/group_test.go
index 5ab047a0..a469d1f4 100644
--- a/bydbctl/internal/cmd/group_test.go
+++ b/bydbctl/internal/cmd/group_test.go
@@ -50,9 +50,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -85,9 +82,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 1
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -119,9 +113,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/bydbctl/internal/cmd/index_rule_binding_test.go
b/bydbctl/internal/cmd/index_rule_binding_test.go
index 1c447ad4..1f3c8a9e 100644
--- a/bydbctl/internal/cmd/index_rule_binding_test.go
+++ b/bydbctl/internal/cmd/index_rule_binding_test.go
@@ -50,9 +50,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/bydbctl/internal/cmd/index_rule_test.go
b/bydbctl/internal/cmd/index_rule_test.go
index 1f99bf25..f58ffe2c 100644
--- a/bydbctl/internal/cmd/index_rule_test.go
+++ b/bydbctl/internal/cmd/index_rule_test.go
@@ -50,9 +50,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -74,8 +71,7 @@ metadata:
name: name1
group: group1
tags: ["layer"]
-type: TYPE_INVERTED
-location: LOCATION_SERIES`))
+type: TYPE_INVERTED`))
return capturer.CaptureStdout(func() {
err := rootCmd.Execute()
if err != nil {
@@ -106,8 +102,7 @@ metadata:
name: name1
group: group1
tags: ["layer"]
-type: TYPE_INVERTED
-location: LOCATION_SERIES`))
+type: TYPE_INVERTED`))
out := capturer.CaptureStdout(func() {
err := rootCmd.Execute()
Expect(err).NotTo(HaveOccurred())
@@ -146,8 +141,7 @@ metadata:
name: name2
group: group1
tags: ["layer"]
-type: TYPE_INVERTED
-location: LOCATION_SERIES`))
+type: TYPE_INVERTED`))
out := capturer.CaptureStdout(func() {
err := rootCmd.Execute()
Expect(err).NotTo(HaveOccurred())
diff --git a/bydbctl/internal/cmd/measure_test.go
b/bydbctl/internal/cmd/measure_test.go
index 1f538526..93dd42f2 100644
--- a/bydbctl/internal/cmd/measure_test.go
+++ b/bydbctl/internal/cmd/measure_test.go
@@ -57,9 +57,6 @@ metadata:
catalog: CATALOG_MEASURE
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/bydbctl/internal/cmd/stream_test.go
b/bydbctl/internal/cmd/stream_test.go
index a46034c9..ef2643fa 100644
--- a/bydbctl/internal/cmd/stream_test.go
+++ b/bydbctl/internal/cmd/stream_test.go
@@ -57,9 +57,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/dist/LICENSE b/dist/LICENSE
index 978452f5..3d7db32b 100644
--- a/dist/LICENSE
+++ b/dist/LICENSE
@@ -178,20 +178,15 @@
Apache-2.0 licenses
========================================================================
- github.com/SkyAPM/badger/v3 v3.0.0-20230511223516-583c6a825854 Apache-2.0
github.com/apache/skywalking-cli v0.0.0-20231201043336-d5f3597733aa
Apache-2.0
github.com/blevesearch/segment v0.9.1 Apache-2.0
github.com/blevesearch/vellum v1.0.10 Apache-2.0
github.com/coreos/go-semver v0.3.1 Apache-2.0
github.com/coreos/go-systemd/v22 v22.5.0 Apache-2.0
- github.com/dgraph-io/ristretto v0.1.1 Apache-2.0
github.com/envoyproxy/protoc-gen-validate v1.0.2 Apache-2.0
github.com/go-logr/logr v1.3.0 Apache-2.0
github.com/go-logr/stdr v1.2.2 Apache-2.0
- github.com/golang/glog v1.2.0 Apache-2.0
- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da Apache-2.0
github.com/google/btree v1.1.2 Apache-2.0
- github.com/google/flatbuffers v23.5.26+incompatible Apache-2.0
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e Apache-2.0
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 Apache-2.0
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0
Apache-2.0
@@ -224,7 +219,6 @@ Apache-2.0 licenses
go.etcd.io/etcd/pkg/v3 v3.5.11 Apache-2.0
go.etcd.io/etcd/raft/v3 v3.5.11 Apache-2.0
go.etcd.io/etcd/server/v3 v3.5.11 Apache-2.0
- go.opencensus.io v0.24.0 Apache-2.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.46.1 Apache-2.0
go.opentelemetry.io/otel v1.21.0 Apache-2.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 Apache-2.0
@@ -282,6 +276,7 @@ BSD-3-Clause licenses
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
BSD-3-Clause
github.com/sagikazarmark/slog-shim v0.1.0 BSD-3-Clause
github.com/shirou/gopsutil/v3 v3.23.11 BSD-3-Clause
+ github.com/spaolacci/murmur3 v1.1.0 BSD-3-Clause
github.com/spf13/pflag v1.0.5 BSD-3-Clause
github.com/tklauser/go-sysconf v0.3.13 BSD-3-Clause
github.com/xhit/go-str2duration/v2 v2.1.0 BSD-3-Clause
diff --git a/dist/licenses/license-github.com-SkyAPM-badger-v3.txt
b/dist/licenses/license-github.com-SkyAPM-badger-v3.txt
deleted file mode 100644
index d9a10c0d..00000000
--- a/dist/licenses/license-github.com-SkyAPM-badger-v3.txt
+++ /dev/null
@@ -1,176 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
diff --git a/dist/licenses/license-github.com-dgraph-io-ristretto.txt
b/dist/licenses/license-github.com-dgraph-io-ristretto.txt
deleted file mode 100644
index d9a10c0d..00000000
--- a/dist/licenses/license-github.com-dgraph-io-ristretto.txt
+++ /dev/null
@@ -1,176 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
diff --git a/dist/licenses/license-github.com-golang-glog.txt
b/dist/licenses/license-github.com-golang-glog.txt
deleted file mode 100644
index 37ec93a1..00000000
--- a/dist/licenses/license-github.com-golang-glog.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and
configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object
code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
made
-available under the License, as indicated by a copyright notice that is
included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the
copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and
such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You
distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
whole,
-provided Your use, reproduction, and distribution of the Work otherwise
complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms
of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides
the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License
or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction,
or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License.
However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any
liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
within
-third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/dist/licenses/license-github.com-golang-groupcache.txt
b/dist/licenses/license-github.com-golang-groupcache.txt
deleted file mode 100644
index 37ec93a1..00000000
--- a/dist/licenses/license-github.com-golang-groupcache.txt
+++ /dev/null
@@ -1,191 +0,0 @@
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction, and
-distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the copyright
-owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other entities
-that control, are controlled by, or are under common control with that entity.
-For the purposes of this definition, "control" means (i) the power, direct or
-indirect, to cause the direction or management of such entity, whether by
-contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications, including
-but not limited to software source code, documentation source, and
configuration
-files.
-
-"Object" form shall mean any form resulting from mechanical transformation or
-translation of a Source form, including but not limited to compiled object
code,
-generated documentation, and conversions to other media types.
-
-"Work" shall mean the work of authorship, whether in Source or Object form,
made
-available under the License, as indicated by a copyright notice that is
included
-in or attached to the work (an example is provided in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form, that
-is based on (or derived from) the Work and for which the editorial revisions,
-annotations, elaborations, or other modifications represent, as a whole, an
-original work of authorship. For the purposes of this License, Derivative Works
-shall not include works that remain separable from, or merely link (or bind by
-name) to the interfaces of, the Work and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the original
version
-of the Work and any modifications or additions to that Work or Derivative Works
-thereof, that is intentionally submitted to Licensor for inclusion in the Work
-by the copyright owner or by an individual or Legal Entity authorized to submit
-on behalf of the copyright owner. For the purposes of this definition,
-"submitted" means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems, and
-issue tracking systems that are managed by, or on behalf of, the Licensor for
-the purpose of discussing and improving the Work, but excluding communication
-that is conspicuously marked or otherwise designated in writing by the
copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
-of whom a Contribution has been received by Licensor and subsequently
-incorporated within the Work.
-
-2. Grant of Copyright License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the Work and
such
-Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-
-Subject to the terms and conditions of this License, each Contributor hereby
-grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
-irrevocable (except as stated in this section) patent license to make, have
-made, use, offer to sell, sell, import, and otherwise transfer the Work, where
-such license applies only to those patent claims licensable by such Contributor
-that are necessarily infringed by their Contribution(s) alone or by combination
-of their Contribution(s) with the Work to which such Contribution(s) was
-submitted. If You institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work or a
-Contribution incorporated within the Work constitutes direct or contributory
-patent infringement, then any patent licenses granted to You under this License
-for that Work shall terminate as of the date such litigation is filed.
-
-4. Redistribution.
-
-You may reproduce and distribute copies of the Work or Derivative Works thereof
-in any medium, with or without modifications, and in Source or Object form,
-provided that You meet the following conditions:
-
-You must give any other recipients of the Work or Derivative Works a copy of
-this License; and
-You must cause any modified files to carry prominent notices stating that You
-changed the files; and
-You must retain, in the Source form of any Derivative Works that You
distribute,
-all copyright, patent, trademark, and attribution notices from the Source form
-of the Work, excluding those notices that do not pertain to any part of the
-Derivative Works; and
-If the Work includes a "NOTICE" text file as part of its distribution, then any
-Derivative Works that You distribute must include a readable copy of the
-attribution notices contained within such NOTICE file, excluding those notices
-that do not pertain to any part of the Derivative Works, in at least one of the
-following places: within a NOTICE text file distributed as part of the
-Derivative Works; within the Source form or documentation, if provided along
-with the Derivative Works; or, within a display generated by the Derivative
-Works, if and wherever such third-party notices normally appear. The contents
of
-the NOTICE file are for informational purposes only and do not modify the
-License. You may add Your own attribution notices within Derivative Works that
-You distribute, alongside or as an addendum to the NOTICE text from the Work,
-provided that such additional attribution notices cannot be construed as
-modifying the License.
-You may add Your own copyright statement to Your modifications and may provide
-additional or different license terms and conditions for use, reproduction, or
-distribution of Your modifications, or for any such Derivative Works as a
whole,
-provided Your use, reproduction, and distribution of the Work otherwise
complies
-with the conditions stated in this License.
-
-5. Submission of Contributions.
-
-Unless You explicitly state otherwise, any Contribution intentionally submitted
-for inclusion in the Work by You to the Licensor shall be under the terms and
-conditions of this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify the terms
of
-any separate license agreement you may have executed with Licensor regarding
-such Contributions.
-
-6. Trademarks.
-
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-
-Unless required by applicable law or agreed to in writing, Licensor provides
the
-Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
-including, without limitation, any warranties or conditions of TITLE,
-NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
-solely responsible for determining the appropriateness of using or
-redistributing the Work and assume any risks associated with Your exercise of
-permissions under this License.
-
-8. Limitation of Liability.
-
-In no event and under no legal theory, whether in tort (including negligence),
-contract, or otherwise, unless required by applicable law (such as deliberate
-and grossly negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special, incidental,
-or consequential damages of any character arising as a result of this License
or
-out of the use or inability to use the Work (including but not limited to
-damages for loss of goodwill, work stoppage, computer failure or malfunction,
or
-any and all other commercial damages or losses), even if such Contributor has
-been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-
-While redistributing the Work or Derivative Works thereof, You may choose to
-offer, and charge a fee for, acceptance of support, warranty, indemnity, or
-other liability obligations and/or rights consistent with this License.
However,
-in accepting such obligations, You may act only on Your own behalf and on Your
-sole responsibility, not on behalf of any other Contributor, and only if You
-agree to indemnify, defend, and hold each Contributor harmless for any
liability
-incurred by, or claims asserted against, such Contributor by reason of your
-accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work
-
-To apply the Apache License to your work, attach the following boilerplate
-notice, with the fields enclosed by brackets "[]" replaced with your own
-identifying information. (Don't include the brackets!) The text should be
-enclosed in the appropriate comment syntax for the file format. We also
-recommend that a file or class name and description of purpose be included on
-the same "printed page" as the copyright notice for easier identification
within
-third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/dist/licenses/license-github.com-google-flatbuffers.txt
b/dist/licenses/license-github.com-google-flatbuffers.txt
deleted file mode 100644
index d6456956..00000000
--- a/dist/licenses/license-github.com-google-flatbuffers.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/dist/licenses/license-github.com-spaolacci-murmur3.txt
b/dist/licenses/license-github.com-spaolacci-murmur3.txt
new file mode 100644
index 00000000..2a46fd75
--- /dev/null
+++ b/dist/licenses/license-github.com-spaolacci-murmur3.txt
@@ -0,0 +1,24 @@
+Copyright 2013, Sébastien Paolacci.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the library nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/dist/licenses/license-go.opencensus.io.txt
b/dist/licenses/license-go.opencensus.io.txt
deleted file mode 100644
index 7a4a3ea2..00000000
--- a/dist/licenses/license-go.opencensus.io.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
diff --git a/docs/concept/data-model.md b/docs/concept/data-model.md
index 3d9cd086..442c1f71 100644
--- a/docs/concept/data-model.md
+++ b/docs/concept/data-model.md
@@ -31,9 +31,6 @@ metadata:
catalog: CATALOG_MEASURE
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -265,13 +262,10 @@ metadata:
group: sw_stream
tags:
- trace_id
-type: TYPE_TREE
-location: LOCATION_GLOBAL
+type: TYPE_INVERTED
```
-IndexRule supports selecting two distinct kinds of index structures. The
`INVERTED` index is the primary option when users set up an index rule. It's
suitable for most tag indexing due to a better memory usage ratio and query
performance. When there are many unique tag values here, such as the `ID` tag
and numeric duration tag, the `TREE` index could be better. This index saves
much memory space with high-cardinality data sets.
-
-Most IndexRule's location is `LOCAL` which places indices with their indexed
data together. IndexRule also provides a `GLOBAL` location to place some
indices on a higher layer of hierarchical structure. This option intends to
optimize the full-scan operation for some querying cases of no time range
specification, such as finding spans from a trace by `trace_id`.
+IndexRule supports selecting two distinct kinds of index structures. The
`INVERTED` index is the primary option when users set up an index rule. It's
suitable for most tag indexing due to a better memory usage ratio and query
performance.
```yaml
metadata:
diff --git a/docs/crud/group.md b/docs/crud/group.md
index 7833670c..2d79377b 100644
--- a/docs/crud/group.md
+++ b/docs/crud/group.md
@@ -19,9 +19,6 @@ metadata:
catalog: CATALOG_MEASURE
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -60,9 +57,6 @@ metadata:
catalog: CATALOG_MEASURE
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/docs/crud/index_rule.md b/docs/crud/index_rule.md
index d6ce08e8..03485f41 100644
--- a/docs/crud/index_rule.md
+++ b/docs/crud/index_rule.md
@@ -24,9 +24,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
@@ -50,12 +47,11 @@ metadata:
group: sw_stream
tags:
- trace_id
-type: TYPE_TREE
-location: LOCATION_GLOBAL
+type: TYPE_INVERTED
EOF
```
-This YAML creates an index rule which uses the tag `trace_id` to generate a
`TREE_TYPE` index which is located at `GLOBAL`.
+This YAML creates an index rule which uses the tag `trace_id` to generate a
`TYPE_INVERTED` index.
## Get operation
@@ -83,7 +79,6 @@ metadata:
tags:
- trace_id
type: TYPE_INVERTED
-location: LOCATION_GLOBAL
EOF
```
diff --git a/docs/crud/index_rule_binding.md b/docs/crud/index_rule_binding.md
index 3d01b009..078ad29f 100644
--- a/docs/crud/index_rule_binding.md
+++ b/docs/crud/index_rule_binding.md
@@ -22,9 +22,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/docs/crud/measure/schema.md b/docs/crud/measure/schema.md
index ec99547d..687f019f 100644
--- a/docs/crud/measure/schema.md
+++ b/docs/crud/measure/schema.md
@@ -20,9 +20,6 @@ metadata:
catalog: CATALOG_MEASURE
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/docs/crud/stream/schema.md b/docs/crud/stream/schema.md
index 62cd9c6f..126c8791 100644
--- a/docs/crud/stream/schema.md
+++ b/docs/crud/stream/schema.md
@@ -21,9 +21,6 @@ metadata:
catalog: CATALOG_STREAM
resource_opts:
shard_num: 2
- block_interval:
- unit: UNIT_HOUR
- num: 2
segment_interval:
unit: UNIT_DAY
num: 1
diff --git a/pkg/test/measure/testdata/groups/sw_metric.json
b/pkg/test/measure/testdata/groups/sw_metric.json
index 4b7efc4f..a91becb7 100644
--- a/pkg/test/measure/testdata/groups/sw_metric.json
+++ b/pkg/test/measure/testdata/groups/sw_metric.json
@@ -5,10 +5,6 @@
"catalog": "CATALOG_MEASURE",
"resource_opts": {
"shard_num": 2,
- "block_interval": {
- "unit": "UNIT_HOUR",
- "num": 2
- },
"segment_interval": {
"unit": "UNIT_DAY",
"num": 1
diff --git a/pkg/test/measure/testdata/index_rules/id.json
b/pkg/test/measure/testdata/index_rules/id.json
index 676b5aa1..c676824d 100644
--- a/pkg/test/measure/testdata/index_rules/id.json
+++ b/pkg/test/measure/testdata/index_rules/id.json
@@ -8,6 +8,5 @@
"id"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/measure/testdata/index_rules/layer.json
b/pkg/test/measure/testdata/index_rules/layer.json
index 0cad8a64..32d73999 100644
--- a/pkg/test/measure/testdata/index_rules/layer.json
+++ b/pkg/test/measure/testdata/index_rules/layer.json
@@ -8,6 +8,5 @@
"layer"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/measure/testdata/index_rules/searchable_name.json
b/pkg/test/measure/testdata/index_rules/searchable_name.json
index f862a633..afbc37bf 100644
--- a/pkg/test/measure/testdata/index_rules/searchable_name.json
+++ b/pkg/test/measure/testdata/index_rules/searchable_name.json
@@ -8,7 +8,6 @@
"name"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"analyzer": "ANALYZER_SIMPLE",
"updated_at": "2021-04-15T01:30:15.01Z"
}
\ No newline at end of file
diff --git a/pkg/test/measure/testdata/index_rules/service_id.json
b/pkg/test/measure/testdata/index_rules/service_id.json
index 74793de6..c8088dd2 100644
--- a/pkg/test/measure/testdata/index_rules/service_id.json
+++ b/pkg/test/measure/testdata/index_rules/service_id.json
@@ -8,6 +8,5 @@
"service_id"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/group.json
b/pkg/test/stream/testdata/group.json
index e200d011..ac044783 100644
--- a/pkg/test/stream/testdata/group.json
+++ b/pkg/test/stream/testdata/group.json
@@ -5,10 +5,6 @@
"catalog": "CATALOG_STREAM",
"resource_opts": {
"shard_num": 2,
- "block_interval": {
- "unit": "UNIT_HOUR",
- "num": 2
- },
"segment_interval": {
"unit": "UNIT_DAY",
"num": 1
diff --git a/pkg/test/stream/testdata/index_rules/db.instance.json
b/pkg/test/stream/testdata/index_rules/db.instance.json
index 830408e0..691a703e 100644
--- a/pkg/test/stream/testdata/index_rules/db.instance.json
+++ b/pkg/test/stream/testdata/index_rules/db.instance.json
@@ -8,7 +8,6 @@
"db.instance"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"analyzer": "ANALYZER_SIMPLE",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/db.type.json
b/pkg/test/stream/testdata/index_rules/db.type.json
index b13adedc..f23fd03f 100644
--- a/pkg/test/stream/testdata/index_rules/db.type.json
+++ b/pkg/test/stream/testdata/index_rules/db.type.json
@@ -8,6 +8,5 @@
"db.type"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/duration.json
b/pkg/test/stream/testdata/index_rules/duration.json
index 96e2cc62..baae3592 100644
--- a/pkg/test/stream/testdata/index_rules/duration.json
+++ b/pkg/test/stream/testdata/index_rules/duration.json
@@ -7,7 +7,6 @@
"tags": [
"duration"
],
- "type": "TYPE_TREE",
- "location": "LOCATION_SERIES",
+ "type": "TYPE_INVERTED",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/endpoint_id.json
b/pkg/test/stream/testdata/index_rules/endpoint_id.json
index 7625890f..89272177 100644
--- a/pkg/test/stream/testdata/index_rules/endpoint_id.json
+++ b/pkg/test/stream/testdata/index_rules/endpoint_id.json
@@ -8,6 +8,5 @@
"endpoint_id"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/extended_tags.json
b/pkg/test/stream/testdata/index_rules/extended_tags.json
index 38269c59..e0ee4f66 100644
--- a/pkg/test/stream/testdata/index_rules/extended_tags.json
+++ b/pkg/test/stream/testdata/index_rules/extended_tags.json
@@ -8,6 +8,5 @@
"extended_tags"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/http.method.json
b/pkg/test/stream/testdata/index_rules/http.method.json
index b27c103c..b6ce4e9b 100644
--- a/pkg/test/stream/testdata/index_rules/http.method.json
+++ b/pkg/test/stream/testdata/index_rules/http.method.json
@@ -8,6 +8,5 @@
"http.method"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/mq.broker.json
b/pkg/test/stream/testdata/index_rules/mq.broker.json
index 1edfe6ec..95180828 100644
--- a/pkg/test/stream/testdata/index_rules/mq.broker.json
+++ b/pkg/test/stream/testdata/index_rules/mq.broker.json
@@ -8,6 +8,5 @@
"mq.broker"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/mq.queue.json
b/pkg/test/stream/testdata/index_rules/mq.queue.json
index 455d712c..de4aa2eb 100644
--- a/pkg/test/stream/testdata/index_rules/mq.queue.json
+++ b/pkg/test/stream/testdata/index_rules/mq.queue.json
@@ -8,6 +8,5 @@
"mq.queue"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/mq.topic.json
b/pkg/test/stream/testdata/index_rules/mq.topic.json
index 57702890..c292a582 100644
--- a/pkg/test/stream/testdata/index_rules/mq.topic.json
+++ b/pkg/test/stream/testdata/index_rules/mq.topic.json
@@ -8,6 +8,5 @@
"mq.topic"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/status_code.json
b/pkg/test/stream/testdata/index_rules/status_code.json
index 94367a79..dcf04473 100644
--- a/pkg/test/stream/testdata/index_rules/status_code.json
+++ b/pkg/test/stream/testdata/index_rules/status_code.json
@@ -8,6 +8,5 @@
"status_code"
],
"type": "TYPE_INVERTED",
- "location": "LOCATION_SERIES",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git a/pkg/test/stream/testdata/index_rules/trace_id.json
b/pkg/test/stream/testdata/index_rules/trace_id.json
index b7bb2d2b..add7fc33 100644
--- a/pkg/test/stream/testdata/index_rules/trace_id.json
+++ b/pkg/test/stream/testdata/index_rules/trace_id.json
@@ -7,7 +7,6 @@
"tags": [
"trace_id"
],
- "type": "TYPE_TREE",
- "location": "LOCATION_GLOBAL",
+ "type": "TYPE_INVERTED",
"updated_at": "2021-04-15T01:30:15.01Z"
}
diff --git
a/test/stress/istio/testdata/index-rules/measure-default-index-rule.yaml
b/test/stress/istio/testdata/index-rules/measure-default-index-rule.yaml
index f3de033f..cc95f2a3 100644
--- a/test/stress/istio/testdata/index-rules/measure-default-index-rule.yaml
+++ b/test/stress/istio/testdata/index-rules/measure-default-index-rule.yaml
@@ -1,5 +1,4 @@
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "43"
group: measure-default
@@ -11,7 +10,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "49"
group: measure-default
@@ -23,7 +21,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "62"
group: measure-default
@@ -35,7 +32,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "63"
group: measure-default
@@ -47,7 +43,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "42"
group: measure-default
@@ -59,7 +54,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "136"
group: measure-default
@@ -71,7 +65,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "131"
group: measure-default
@@ -83,7 +76,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "21"
group: measure-default
@@ -92,10 +84,9 @@
name: id
tags:
- id
- type: TYPE_TREE
+ type: TYPE_INVERTED
updatedAt: "2023-05-22T18:03:28.011340226Z"
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "23"
group: measure-default
@@ -107,7 +98,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "38"
group: measure-default
@@ -119,7 +109,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "137"
group: measure-default
@@ -131,7 +120,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "134"
group: measure-default
@@ -143,7 +131,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "132"
group: measure-default
@@ -155,7 +142,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "156"
group: measure-default
@@ -167,7 +153,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "44"
group: measure-default
@@ -179,7 +164,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "36"
group: measure-default
@@ -191,7 +175,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "37"
group: measure-default
@@ -203,7 +186,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "129"
group: measure-default
@@ -215,7 +197,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "110"
group: measure-default
@@ -227,7 +208,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "41"
group: measure-default
@@ -239,7 +219,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "130"
group: measure-default
@@ -251,7 +230,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "109"
group: measure-default
@@ -263,7 +241,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "48"
group: measure-default
@@ -275,7 +252,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "60"
group: measure-default
@@ -287,7 +263,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "61"
group: measure-default
@@ -299,7 +274,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "135"
group: measure-default
@@ -311,7 +285,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "155"
group: measure-default
@@ -323,7 +296,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "133"
group: measure-default
diff --git
a/test/stress/istio/testdata/index-rules/measure-minute-index-rule.yaml
b/test/stress/istio/testdata/index-rules/measure-minute-index-rule.yaml
index 85ad69bc..4180da1d 100644
--- a/test/stress/istio/testdata/index-rules/measure-minute-index-rule.yaml
+++ b/test/stress/istio/testdata/index-rules/measure-minute-index-rule.yaml
@@ -1,5 +1,4 @@
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "57"
group: measure-minute
@@ -11,7 +10,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "82"
group: measure-minute
@@ -23,7 +21,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "70"
group: measure-minute
@@ -35,7 +32,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "71"
group: measure-minute
@@ -47,7 +43,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "55"
group: measure-minute
@@ -56,10 +51,9 @@
name: id
tags:
- id
- type: TYPE_TREE
+ type: TYPE_INVERTED
updatedAt: "2023-05-22T18:03:28.196387339Z"
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "412"
group: measure-minute
@@ -71,7 +65,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "80"
group: measure-minute
@@ -83,7 +76,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "56"
group: measure-minute
@@ -95,7 +87,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "81"
group: measure-minute
@@ -107,7 +98,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "68"
group: measure-minute
@@ -119,7 +109,6 @@
type: TYPE_INVERTED
updatedAt: null
- analyzer: ANALYZER_UNSPECIFIED
- location: LOCATION_SERIES
metadata:
createRevision: "69"
group: measure-minute
diff --git a/ui/src/components/IndexRule/Editor.vue
b/ui/src/components/IndexRule/Editor.vue
index bb315ac4..eaa29b0a 100644
--- a/ui/src/components/IndexRule/Editor.vue
+++ b/ui/src/components/IndexRule/Editor.vue
@@ -47,11 +47,6 @@ const rules = {
required: true, message: 'Please select the analyzer', trigger: 'blur'
}
],
- location: [
- {
- required: true, message: 'Please select the location', trigger: 'blur'
- }
- ],
tags: [
{
required: true, message: 'Please select the tags', trigger: 'blur'
@@ -68,29 +63,11 @@ const typeList = [
label: "TYPE_UNSPECIFIED",
value: "TYPE_UNSPECIFIED"
},
- {
- label: "TYPE_TREE",
- value: "TYPE_TREE"
- },
{
label: "TYPE_INVERTED",
value: "TYPE_INVERTED"
}
]
-const locationList = [
- {
- label: "LOCATION_UNSPECIFIED",
- value: "LOCATION_UNSPECIFIED"
- },
- {
- label: "LOCATION_SERIES",
- value: "LOCATION_SERIES"
- },
- {
- label: "LOCATION_GLOBAL",
- value: "LOCATION_GLOBAL"
- }
-]
const analyzerList = [
{
label: "ANALYZER_UNSPECIFIED",
@@ -119,7 +96,6 @@ const data = reactive({
group: route.params.group,
name: route.params.name || '',
analyzer: '',
- location: '',
tags: [],
type: ''
}
@@ -131,7 +107,6 @@ watch(() => route, () => {
group: route.params.group,
name: route.params.name || '',
analyzer: '',
- location: '',
tags: [],
type: ''
}
@@ -157,7 +132,6 @@ const submit = async (formEl: FormInstance | undefined) => {
},
tags: data.form.tags,
type: data.form.type,
- location: data.form.location,
analyzer: data.form.analyzer
}
}
@@ -246,7 +220,6 @@ function initData() {
group: indexRule.metadata.group,
name: indexRule.metadata.name,
analyzer: indexRule.analyzer,
- location: indexRule.location,
tags: indexRule.tags,
type: indexRule.type
}
@@ -306,11 +279,6 @@ function initData() {
<el-option v-for="item in analyzerList" :key="item.value"
:label="item.label" :value="item.value" />
</el-select>
</el-form-item>
- <el-form-item label="Location" prop="location">
- <el-select v-model="data.form.location" placeholder="Choose
Location" style="width: 100%;" clearable>
- <el-option v-for="item in locationList" :key="item.value"
:label="item.label" :value="item.value" />
- </el-select>
- </el-form-item>
<el-form-item label="Tags" prop="tags">
<el-select v-model="data.form.tags" allow-create filterable
default-first-option placeholder="Input Tags"
style="width: 100%;" clearable multiple></el-select>
diff --git a/ui/src/components/IndexRule/index.vue
b/ui/src/components/IndexRule/index.vue
index ae66b8c1..1813d226 100644
--- a/ui/src/components/IndexRule/index.vue
+++ b/ui/src/components/IndexRule/index.vue
@@ -88,9 +88,6 @@ function initData() {
<el-form-item label="Analyzer">
<el-input v-model="data.indexRule.analyzer"
:disabled="true"></el-input>
</el-form-item>
- <el-form-item label="Location">
- <el-input v-model="data.indexRule.location"
:disabled="true"></el-input>
- </el-form-item>
<el-form-item label="Tags">
<el-select v-model="data.indexRule.tags" style="width: 100%;"
:disabled="true" multiple></el-select>
</el-form-item>
