upgrading package: cockroach 20170226 -> 20170301

cockroach/cockroach.patch

@@ -1,6 +1,6 @@
 Index: src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go
---- src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go.orig	2017-02-25 09:57:33.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go	2017-02-25 10:12:48.798536000 +0100
+--- src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go.orig	2017-03-01 10:38:09.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go	2017-03-01 10:40:52.415260000 +0100
 @@ -20,6 +20,7 @@
  
  // #cgo darwin CPPFLAGS: -I../../vendor/github.com/cockroachdb/c-jemalloc/darwin_includes/internal/include
@@ -10,8 +10,8 @@ Index: src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go
  // #cgo !strictld,darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
  // #cgo !strictld,!darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all
 Index: src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go
---- src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go.orig	2017-02-25 09:57:33.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go	2017-02-25 10:12:48.798689000 +0100
+--- src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go.orig	2017-03-01 10:38:09.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go	2017-03-01 10:40:52.415423000 +0100
 @@ -20,6 +20,7 @@
  
  // #cgo darwin CPPFLAGS: -I../../../vendor/github.com/cockroachdb/c-jemalloc/darwin_includes/internal/include
@@ -21,8 +21,8 @@ Index: src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.g
  // #cgo !strictld,darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
  // #cgo !strictld,!darwin LDFLAGS: -Wl,-unresolved-symbols=ignore-all
 Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc
---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc.orig	2017-02-25 09:57:33.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc	2017-02-25 10:12:48.799056000 +0100
+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc.orig	2017-03-01 10:38:09.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc	2017-03-01 10:40:52.415781000 +0100
 @@ -1996,10 +1996,10 @@
      (int64_t)s->getTickerCount(rocksdb::BLOOM_FILTER_PREFIX_USEFUL);
    stats->memtable_hits = (int64_t)s->getTickerCount(rocksdb::MEMTABLE_HIT);
@@ -37,8 +37,8 @@ Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/db.cc
  }
  
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h.orig	2017-02-25 10:12:48.799513000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h	2017-02-25 10:13:21.045632000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h	2017-03-01 10:40:52.416099000 +0100
 @@ -613,9 +613,7 @@
        }
      }
@@ -51,8 +51,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-prot
      void construct(NodeType* p, Args&&... args) {
        // Clang 3.6 doesn't compile static casting to void* directly. (Issue
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h	2017-02-25 10:12:48.800179000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h	2017-03-01 10:40:52.416259000 +0100
 @@ -31,7 +31,7 @@
  #define GOOGLE_PROTOBUF_STUBS_MATHUTIL_H_
  
@@ -63,8 +63,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-prot
  #include <google/protobuf/stubs/common.h>
  #include <google/protobuf/stubs/logging.h>
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h	2017-02-25 10:12:48.800396000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h	2017-03-01 10:40:52.416445000 +0100
 @@ -50,7 +50,7 @@
  #define UTIL_GTL_USE_STD_SHARED_PTR 1
  #endif
@@ -75,8 +75,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-prot
  // These are transitional.  They will be going away soon.
  // Please just #include <memory> and just type std::shared_ptr yourself, instead
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go	2017-02-25 10:12:48.800539000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go	2017-03-01 10:40:52.416593000 +0100
 @@ -13,5 +13,6 @@
  // #cgo freebsd CPPFLAGS: -DOS_FREEBSD
  // #cgo dragonfly CPPFLAGS: -DOS_DRAGONFLY
@@ -85,8 +85,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  // #cgo windows LDFLAGS: -lrpcrt4
  import "C"
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform	2017-02-25 10:12:48.800737000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform	2017-03-01 10:40:52.416797000 +0100
 @@ -384,18 +384,6 @@
      fi
  fi
@@ -107,8 +107,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  
  if test "$USE_HDFS"; then
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh	2017-02-25 10:12:48.800878000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh	2017-03-01 10:40:52.416937000 +0100
 @@ -138,7 +138,7 @@
  # required by libtbb
  EXEC_LDFLAGS+=" -ldl"
@@ -119,8 +119,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS $TBB_LIBS"
  
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h	2017-02-25 10:12:48.801033000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h	2017-03-01 10:40:52.417092000 +0100
 @@ -27,7 +27,7 @@
      #define PLATFORM_IS_LITTLE_ENDIAN \
          (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN)
@@ -140,9 +140,9 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
    #include <sys/types.h>
    #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc	2017-02-25 10:12:48.801255000 +0100
-@@ -52,6 +52,11 @@
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc	2017-03-01 10:40:52.417319000 +0100
+@@ -53,6 +53,11 @@
  #include "util/thread_status_updater.h"
  #include "util/threadpool_imp.h"
  
@@ -155,8 +155,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  #define TMPFS_MAGIC 0x01021994
  #endif
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc	2017-02-25 10:12:48.801555000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc	2017-03-01 10:40:52.417620000 +0100
 @@ -259,7 +259,7 @@
  
  uint64_t ParseUint64(const std::string& value) {
@@ -185,8 +185,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  #else
    return std::strtod(value.c_str(), 0);
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc	2017-02-25 10:12:48.801706000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc	2017-03-01 10:40:52.417771000 +0100
 @@ -94,7 +94,7 @@
  
      if (s.ok()) {
@@ -206,8 +206,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
          fprintf(stderr, "Iter returned unexpected value: %s\n",
                  value.ToString().c_str());
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc	2017-02-25 10:12:48.801907000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc	2017-03-01 10:40:52.417988000 +0100
 @@ -354,7 +354,7 @@
  
    // how many level of details to look for
@@ -227,8 +227,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
    double X = std::floor(clip(x * mapSize + 0.5, 0, mapSize - 1));
    double Y = std::floor(clip(y * mapSize + 0.5, 0, mapSize - 1));
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/persistent_cache/block_cache_tier_file.h
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/persistent_cache/block_cache_tier_file.h.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/persistent_cache/block_cache_tier_file.h	2017-02-25 10:12:48.803450000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/persistent_cache/block_cache_tier_file.h.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/persistent_cache/block_cache_tier_file.h	2017-03-01 10:40:52.418168000 +0100
 @@ -23,6 +23,14 @@
  #include "util/crc32c.h"
  #include "util/mutexlock.h"
@@ -254,8 +254,8 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
    // get cache ID
    uint32_t cacheid() const { return cache_id_; }
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/simulator_cache/sim_cache.cc
---- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/simulator_cache/sim_cache.cc.orig	2017-02-25 09:57:47.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/simulator_cache/sim_cache.cc	2017-02-25 10:12:48.803636000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/simulator_cache/sim_cache.cc.orig	2017-03-01 10:38:21.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/simulator_cache/sim_cache.cc	2017-03-01 10:41:33.560643000 +0100
 @@ -8,6 +8,14 @@
  #include "port/port.h"
  #include "util/statistics.h"
@@ -271,7 +271,7 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
  namespace rocksdb {
  
  namespace {
-@@ -134,8 +142,8 @@
+@@ -136,8 +144,8 @@
  
    virtual std::string ToString() const override {
      std::string res;
@@ -279,6 +279,6 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rock
 -    res.append("SimCache HITs:    " + std::to_string(get_hit_counter()) + "\n");
 +    res.append("SimCache MISSes: " + my_to_string(get_miss_counter()) + "\n");
 +    res.append("SimCache HITs:    " + my_to_string(get_hit_counter()) + "\n");
-     char buff[100];
+     char buff[350];
      auto lookups = get_miss_counter() + get_hit_counter();
      snprintf(buff, sizeof(buff), "SimCache HITRATE: %.2f%%\n",

cockroach/cockroach.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_cockroach_base 20170226
-%define       V_cockroach_snap 20170226
+%define       V_cockroach_base 20170301
+%define       V_cockroach_snap 20170301
 
 #   package information
 Name:         cockroach
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      Apache
 Version:      %{V_cockroach_base}
-Release:      20170226
+Release:      20170301
 
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/cockroach/cockroach-%{V_cockroach_snap}.tar.xz