Skip to content

Commit

Permalink
Update to version v2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
olegator77 committed Aug 27, 2019
1 parent 75e0684 commit 3b133ac
Show file tree
Hide file tree
Showing 78 changed files with 111 additions and 112 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -199,4 +199,4 @@
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.
limitations under the License.
4 changes: 2 additions & 2 deletions benchmarks/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN git clone https://github.com/wg/wrk.git && cd wrk && \

# Install Benchmark's golang dependencies
#########################################
RUN go get -insecure git.itv.restr.im/itv-backend/reindexer && \
RUN go get -insecure github.com/restream/reindexer && \
go get github.com/tarantool/go-tarantool && \
go get github.com/yunge/sphinx && \
go get gopkg.in/mgo.v2 && \
Expand All @@ -50,7 +50,7 @@ RUN go get github.com/boltdb/bolt && \
go get github.com/labstack/echo

# Build Reindexer
RUN make -C /go/src/git.itv.restr.im/itv-backend/reindexer/cpp_src -j8 EXTRA_CFLAGS=-DNDEBUG
RUN make -C /go/src/github.com/restream/reindexer/cpp_src -j8 EXTRA_CFLAGS=-DNDEBUG

# Install elastic search
########################
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_queries_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"
)

func BenchmarkElasticGetByID(b *testing.B) { repo.Get("elastic").QueryByID(b.N, false) }
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/bench_text_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"
)

func BenchmarkElasticFullText(b *testing.B) {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"log"
"unicode/utf8"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"

"github.com/buaazp/fasthttprouter"
"github.com/valyala/fasthttp"
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/http_echo.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"net/http"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"

"github.com/labstack/echo"
)
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/init_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"
"testing"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"
)

func TestMain(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"flag"

"git.itv.restr.im/itv-backend/reindexer/benchmarks/repo"
"github.com/restream/reindexer/benchmarks/repo"
)

const itemsInDataSet = 100000
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/repo/reindex.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"log"
"math/rand"

"git.itv.restr.im/itv-backend/reindexer"
_ "git.itv.restr.im/itv-backend/reindexer/bindings/builtin"
_ "git.itv.restr.im/itv-backend/reindexer/bindings/cproto"
"github.com/restream/reindexer"
_ "github.com/restream/reindexer/bindings/builtin"
_ "github.com/restream/reindexer/bindings/cproto"
)

type ReindexRepo struct {
Expand Down
6 changes: 3 additions & 3 deletions bindings.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strings"
"time"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver/config"
"git.itv.restr.im/itv-backend/reindexer/cjson"
"github.com/restream/reindexer/bindings"
"github.com/restream/reindexer/bindings/builtinserver/config"
"github.com/restream/reindexer/cjson"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions bindings/builtin/builtin.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"time"
"unsafe"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"git.itv.restr.im/itv-backend/reindexer/cjson"
"github.com/restream/reindexer/bindings"
"github.com/restream/reindexer/cjson"
)

const defCgoLimit = 2000
Expand Down
6 changes: 3 additions & 3 deletions bindings/builtinserver/builtinserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"time"
"unsafe"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"git.itv.restr.im/itv-backend/reindexer/bindings/builtin"
"git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver/config"
"github.com/restream/reindexer/bindings"
"github.com/restream/reindexer/bindings/builtin"
"github.com/restream/reindexer/bindings/builtinserver/config"
)

var defaultStartupTimeout time.Duration = time.Minute * 3
Expand Down
4 changes: 2 additions & 2 deletions bindings/cproto/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"sync/atomic"
"time"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"git.itv.restr.im/itv-backend/reindexer/cjson"
"github.com/restream/reindexer/bindings"
"github.com/restream/reindexer/cjson"
)

type bufPtr struct {
Expand Down
4 changes: 2 additions & 2 deletions bindings/cproto/cproto.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync/atomic"
"time"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"git.itv.restr.im/itv-backend/reindexer/cjson"
"github.com/restream/reindexer/bindings"
"github.com/restream/reindexer/cjson"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions bindings/cproto/encdec.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"unsafe"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"github.com/restream/reindexer/bindings"

"git.itv.restr.im/itv-backend/reindexer/cjson"
"github.com/restream/reindexer/cjson"
)

type rpcEncoder struct {
Expand Down
2 changes: 1 addition & 1 deletion bindings/cproto/netbuf.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sync"
"time"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"github.com/restream/reindexer/bindings"
)

var bufPool sync.Pool
Expand Down
2 changes: 1 addition & 1 deletion bindings/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/url"
"time"

"git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver/config"
"github.com/restream/reindexer/bindings/builtinserver/config"
)

type IndexDef struct {
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
2 changes: 1 addition & 1 deletion cpp_src/client/namespace.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Item Namespace::NewItem() {
}

} // namespace client
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/client/namespace.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ class Namespace {
};

} // namespace client
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/cmake/modules/FindGperftools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ mark_as_advanced(
GPERFTOOLS_TCMALLOC_AND_PROFILER
GPERFTOOLS_LIBRARIES
GPERFTOOLS_INCLUDE_DIR)


2 changes: 1 addition & 1 deletion cpp_src/cmake/modules/FindJemalloc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ if ( UNIX )
endif ( JEMALLOC_LIBRARY )

mark_as_advanced( JEMALLOC_FOUND JEMALLOC_LIBRARY JEMALLOC_EXTRA_LIBRARIES JEMALLOC_INCLUDE_DIR )
endif (UNIX)
endif (UNIX)
2 changes: 1 addition & 1 deletion cpp_src/cmake/modules/FindSnappy.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ endif ()
mark_as_advanced(
SNAPPY_LIBRARY
SNAPPY_INCLUDE_DIR
)
)
2 changes: 1 addition & 1 deletion cpp_src/cmd/reindexer_server/contrib/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN mkdir /src && \
echo "noinst_PROGRAMS =" >> Makefile.am && \
./autogen.sh && ./configure && make -j8 && make install && \
cd .. && \
git clone https://git.itv.restr.im/itv-backend/reindexer && \
git clone https://github.com/restream/reindexer && \
cd reindexer && \
git checkout develop && \
./dependencies.sh && \
Expand Down
2 changes: 1 addition & 1 deletion cpp_src/cmd/reindexer_server/contrib/sysvinit.in
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ case "$1" in
;;
esac

exit 0
exit 0
2 changes: 1 addition & 1 deletion cpp_src/cmd/reindexer_server/test/mocks/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"*": "owner"
}
}
}
}
Binary file removed cpp_src/cmd/reindexer_tool/contrib/testdb.tar.bz2
Binary file not shown.
2 changes: 1 addition & 1 deletion cpp_src/core/cjson/cjsonbuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,4 @@ class CJsonBuilder {
int count_ = 0;
};

} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/core/ft/numtotext.cc
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@ vector<string>& NumToText::convert(string_view str, std::vector<std::string>& ou
}
return output;
}
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/core/ft/numtotext.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ class NumToText {
static std::vector<std::string>& convert(string_view numStr, std::vector<std::string>& output);
};

} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/core/ft/stopwords/stop.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
namespace reindexer {
extern const char *stop_words_ru[];
extern const char *stop_words_en[];
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/core/ft/typos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ void mktypos(typos_context *ctx, string_view word, int level, int maxTyposLen, s
mktyposInternal(ctx, ctx->utf16Word, level, maxTyposLen, callback);
}

} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/estl/chunk_buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ class chain_buf {
Mutex mtx_;
};

}; // namespace reindexer
}; // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/estl/span.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@ class span {

inline static span<char> giftStr(string_view sv) { return span<char>(const_cast<char*>(sv.data()), sv.size()); }

} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/estl/trivial_reverse_iterator.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,4 @@ class trivial_reverse_iterator
inline bool EQ(Iterator lhs, Iterator rhs) const { return lhs == rhs; }
};

} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/gtests/bench/dict.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125720,4 +125720,4 @@
ящик
ящичек
ящичник
ящичный
ящичный
2 changes: 1 addition & 1 deletion cpp_src/replicator/walrecord.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ struct PackedWALRecord : public h_vector<uint8_t, 12> {
using h_vector<uint8_t, 12>::h_vector;
void Pack(const WALRecord &rec);
};
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/replicator/walselecter.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ class WALSelecter {
Namespace *ns_;
};

}; // namespace reindexer
}; // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/server/rpcupdatespusher.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ class RPCUpdatesPusher : public reindexer::IUpdatesObserver {
};
} // namespace cproto
} // namespace net
} // namespace reindexer
} // namespace reindexer
2 changes: 1 addition & 1 deletion cpp_src/vendor/atoi/atoi.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,4 +216,4 @@ inline typename std::enable_if<std::is_unsigned<T>::value, T>::type atoi(char co

} // namespace jsteemann

#endif
#endif
2 changes: 1 addition & 1 deletion cpp_src/vendor/base64/base64.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,4 +181,4 @@ int Base64encode(char *encoded, const char *string, int len) {

*p++ = '\0';
return p - encoded;
}
}
2 changes: 1 addition & 1 deletion dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ if [ $? -eq 0 ]; then
fi
else
error_msg "Unsupported OS type."
fi
fi
2 changes: 1 addition & 1 deletion iterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"strings"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"github.com/restream/reindexer/bindings"
)

// ExplainResults presents query plan
Expand Down
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ import (
"fmt"
"math/rand"

"git.itv.restr.im/itv-backend/reindexer"
"github.com/restream/reindexer"
// choose how the Reindexer binds to the app (in this case "builtin," which means link Reindexer as a static library)
_ "git.itv.restr.im/itv-backend/reindexer/bindings/builtin"
_ "github.com/restream/reindexer/bindings/builtin"

// OR link Reindexer as static library with bundled server.
// _ "git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver"
// "git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver/config"
// _ "github.com/restream/reindexer/bindings/builtinserver"
// "github.com/restream/reindexer/bindings/builtinserver/config"

)

Expand Down
2 changes: 1 addition & 1 deletion reflect.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"
"unsafe"

"git.itv.restr.im/itv-backend/reindexer/bindings"
"github.com/restream/reindexer/bindings"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions reindexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package reindexer
import (
"context"

"git.itv.restr.im/itv-backend/reindexer/bindings"
_ "git.itv.restr.im/itv-backend/reindexer/bindings/cproto"
"git.itv.restr.im/itv-backend/reindexer/dsl"
// _ "git.itv.restr.im/itv-backend/reindexer/bindings/builtinserver"
"github.com/restream/reindexer/bindings"
_ "github.com/restream/reindexer/bindings/cproto"
"github.com/restream/reindexer/dsl"
// _ "github.com/restream/reindexer/bindings/builtinserver"
)

// Condition types
Expand Down
Loading

0 comments on commit 3b133ac

Please sign in to comment.