From 21c67352afbff5bada56f6257487e30fb8439d13 Mon Sep 17 00:00:00 2001 From: Matt Jaffee Date: Mon, 28 Dec 2020 15:25:13 -0600 Subject: [PATCH] remove paranoia mode in top level Pilosa --- Makefile | 2 +- nop_paranoia.go | 19 ------------------- paranoia.go | 19 ------------------- row.go | 5 ----- 4 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 nop_paranoia.go delete mode 100644 paranoia.go diff --git a/Makefile b/Makefile index d622a235c..abd07304d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ RELEASE ?= 0 RELEASE_ENABLED = $(subst 0,,$(RELEASE)) BUILD_TAGS += $(if $(RELEASE_ENABLED),release) BUILD_TAGS += shardwidth$(SHARD_WIDTH) -TEST_TAGS = roaringparanoia paranoia +TEST_TAGS = roaringparanoia define LICENSE_HASH_CODE head -13 $1 | sed -e 's/Copyright 20[0-9][0-9]/Copyright 20XX/g' | shasum | cut -f 1 -d " " endef diff --git a/nop_paranoia.go b/nop_paranoia.go deleted file mode 100644 index 77cdae411..000000000 --- a/nop_paranoia.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 Pilosa Corp. -// -// 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. - -// +build !paranoia - -package pilosa - -const paranoia = false diff --git a/paranoia.go b/paranoia.go deleted file mode 100644 index fb717db91..000000000 --- a/paranoia.go +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2020 Pilosa Corp. -// -// 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. - -// +build paranoia - -package pilosa - -const paranoia = true diff --git a/row.go b/row.go index 98f5c9275..46a0ec478 100644 --- a/row.go +++ b/row.go @@ -301,11 +301,6 @@ func (r *Row) Union(others ...*Row) *Row { toProcess := make([]*rowSegment, 0, len(others)+1) var output []rowSegment for _, other := range others { - if paranoia { // nolint:staticcheck - // TODO I think there is a good check we can do here, but - // it's nontrivial to check whether two rows are - // compatible because of foreign indexes and such. - } if len(other.segments) > 0 { segments = append(segments, other.segments) }