Attachment #222907 for bug #238403





PORTNAME=	cockroach
DISTVERSIONPREFIX=	v
DISTVERSION=	19.1.11
CATEGORIES=	databases
MASTER_SITES=	https://binaries.cockroachdb.com/
EXTRACT_SUFX=	.src.tgz

LICENSE_FILE=	${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE

ONLY_FOR_ARCHS=	amd64
ONLY_FOR_ARCHS_REASON=	"A 64-bit system is strongly recommended"

BUILD_DEPENDS=	autoconf:devel/autoconf \
		bash:shells/bash \


USES=		gmake go libedit

USE_GCC=	yes # RocksDB is broken with clang - See PR 236213
USE_RC_SUBR=	cockroach

NO_CCACHE=	yes
ALL_TARGET=	build

PLIST_FILES=	bin/cockroach


		${MAKE_CMD} -C ${WRKSRC} buildoss

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroachoss ${STAGEDIR}${PREFIX}/bin/cockroach

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)databases/cockroach/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1552343259	1	TIMESTAMP = 1614623246
2	SHA256 (cockroach-v2.0.7.src.tgz) = 0aa42e8a87d0b915d6e7a9df39e3bb32eac250c1afc25e37cc36585f3afa081a	2	SHA256 (cockroach-v19.1.11.src.tgz) = 9c6d93b0560ad53d2c8699b523849f30ddd5250807fdfa2def09442542ec624d
3	SIZE (cockroach-v2.0.7.src.tgz) = 45565811	3	SIZE (cockroach-v19.1.11.src.tgz) = 103214436




--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2018-12-10 15:51:01 UTC
+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
@@ -1986,22 +1986,22 @@ func (r *rocksDBIterator) Valid() (bool, error) {
 
 func (r *rocksDBIterator) Next() {
 	r.checkEngineOpen()
-	r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */))
+	r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */))
 }
 
 func (r *rocksDBIterator) Prev() {
 	r.checkEngineOpen()
-	r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */))
+	r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */))
 }
 
 func (r *rocksDBIterator) NextKey() {
 	r.checkEngineOpen()
-	r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */))
+	r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */))
 }
 
 func (r *rocksDBIterator) PrevKey() {
 	r.checkEngineOpen()
-	r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */))
+	r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */))
 }
 
 func (r *rocksDBIterator) Key() MVCCKey {

Lines 8-11 Link Here

(-)databases/cockroach/pkg-descr (-1 / +1 lines)
8	CockroachDB is inspired by Google's Spanner and F1 technologies, and	8	CockroachDB is inspired by Google's Spanner and F1 technologies, and
9	it's completely open source.	9	it's completely open source.
10		10
11	WWW: https://cockroachlabs.io/	11	WWW: https://www.cockroachlabs.com/

Return to bug 238403

Lines 2-8 Link Here

(-)databases/cockroach/Makefile (-3 / +5 lines)
2		2
3	PORTNAME= cockroach	3	PORTNAME= cockroach
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 2.0.7	5	DISTVERSION= 19.1.11
6	CATEGORIES= databases	6	CATEGORIES= databases
7	MASTER_SITES= https://binaries.cockroachdb.com/	7	MASTER_SITES= https://binaries.cockroachdb.com/
8	EXTRACT_SUFX= .src.tgz	8	EXTRACT_SUFX= .src.tgz
Lines 14-20 Link Here
14	LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE	14	LICENSE_FILE= ${WRKSRC}/src/github.com/cockroachdb/cockroach/LICENSE
15		15
16	ONLY_FOR_ARCHS= amd64	16	ONLY_FOR_ARCHS= amd64
17	ONLY_FOR_ARCHS_REASON= "Only supported on amd64"	17	ONLY_FOR_ARCHS_REASON= "A 64-bit system is strongly recommended"
18		18
19	BUILD_DEPENDS= autoconf:devel/autoconf \	19	BUILD_DEPENDS= autoconf:devel/autoconf \
20	bash:shells/bash \	20	bash:shells/bash \
Lines 22-30 Link Here
22		22
23	USES= gmake go libedit	23	USES= gmake go libedit
24		24
		25	USE_GCC= yes # RocksDB is broken with clang - See PR 236213
25	USE_RC_SUBR= cockroach	26	USE_RC_SUBR= cockroach
26		27
27	NO_CCACHE= yes	28	NO_CCACHE= yes
		29	ALL_TARGET= build
28		30
29	PLIST_FILES= bin/cockroach	31	PLIST_FILES= bin/cockroach
30		32
Lines 43-48 Link Here
43	${MAKE_CMD} -C ${WRKSRC} buildoss	45	${MAKE_CMD} -C ${WRKSRC} buildoss
44		46
45	do-install:	47	do-install:
46	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroach ${STAGEDIR}${PREFIX}/bin/	48	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/cockroachdb/cockroach/cockroachoss ${STAGEDIR}${PREFIX}/bin/cockroach
47		49
48	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-29 Link Here

(-)databases/cockroach/files/patch-src_github.com_cockroachdb_cockroach_pkg_storage_engine_rocksdb.go (-29 lines)
1	--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-12-10 15:51:01 UTC
2	+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
3	@@ -1986,22 +1986,22 @@ func (r *rocksDBIterator) Valid() (bool, error) {
4
5	func (r *rocksDBIterator) Next() {
6	r.checkEngineOpen()
7	- r.setState(C.DBIterNext(r.iter, false /* skip_current_key_versions */))
8	+ r.setState(C.DBIterNext(r.iter, C.bool(false) /* skip_current_key_versions */))
9	}
10
11	func (r *rocksDBIterator) Prev() {
12	r.checkEngineOpen()
13	- r.setState(C.DBIterPrev(r.iter, false /* skip_current_key_versions */))
14	+ r.setState(C.DBIterPrev(r.iter, C.bool(false) /* skip_current_key_versions */))
15	}
16
17	func (r *rocksDBIterator) NextKey() {
18	r.checkEngineOpen()
19	- r.setState(C.DBIterNext(r.iter, true /* skip_current_key_versions */))
20	+ r.setState(C.DBIterNext(r.iter, C.bool(true) /* skip_current_key_versions */))
21	}
22
23	func (r *rocksDBIterator) PrevKey() {
24	r.checkEngineOpen()
25	- r.setState(C.DBIterPrev(r.iter, true /* skip_current_key_versions */))
26	+ r.setState(C.DBIterPrev(r.iter, C.bool(true) /* skip_current_key_versions */))
27	}
28
29	func (r *rocksDBIterator) Key() MVCCKey {