Merge branch 'go-1.18'

This commit is contained in:
Fedor Korotkiy 2022-04-02 14:44:39 +03:00
commit 7658844998
91 changed files with 9 additions and 91 deletions

View file

@ -1,6 +1,6 @@
# Курс по Го в ШАД # Курс по Го в ШАД
Для работы с кодом нужен go 1.17 или выше. Для работы с кодом нужен go 1.18 или выше.
```sh ```sh
git clone https://gitlab.com/slon/shad-go.git git clone https://gitlab.com/slon/shad-go.git

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package allocs package allocs

View file

@ -1,5 +1,4 @@
//go:build !solution && !change //go:build !solution && !change
// +build !solution,!change
package allocs package allocs

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package batcher package batcher

View file

@ -1,5 +1,4 @@
//go:build race //go:build race
// +build race
package batcher package batcher

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package slow package slow

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package blowfish package blowfish

View file

@ -1,10 +1,10 @@
FROM golang:1.17 FROM golang:1.18
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
rsync libssl-dev postgresql sudo redis-server \ rsync libssl-dev postgresql sudo redis-server \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.44.0 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.2
RUN curl -L "https://github.com/docker/compose/releases/download/1.28.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose RUN curl -L "https://github.com/docker/compose/releases/download/1.28.5/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
RUN chmod +x /usr/local/bin/docker-compose RUN chmod +x /usr/local/bin/docker-compose
RUN curl -fsSL https://get.docker.com | sh RUN curl -fsSL https://get.docker.com | sh

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package ciletters package ciletters

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package ciletters package ciletters

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package cond package cond

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package app package app

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package app package app

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package client package client

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package models package models

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package models package models

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package utils package utils

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package api package api

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package api package api

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package api package api

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package api package api

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package artifact package artifact

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package artifact package artifact

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package artifact package artifact

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package client package client

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package dist package dist

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package filecache package filecache

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package filecache package filecache

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package filecache package filecache

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package scheduler package scheduler

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package tarstream package tarstream

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package worker package worker

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package dupcall package dupcall

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package externalsort package externalsort

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package externalsort package externalsort

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package fileleak package fileleak

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

2
go.mod
View file

@ -1,6 +1,6 @@
module gitlab.com/slon/shad-go module gitlab.com/slon/shad-go
go 1.17 go 1.18
require ( require (
github.com/ClickHouse/clickhouse-go v1.4.0 github.com/ClickHouse/clickhouse-go v1.4.0

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package hogwarts package hogwarts

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package hotelbusiness package hotelbusiness

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package illegal package illegal

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package internal package internal

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package illegal package illegal

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package jsonlist package jsonlist

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package jsonrpc package jsonrpc

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package keylock package keylock

View file

@ -1,7 +1,10 @@
package hasql package hasql
import ( import (
"context"
"database/sql"
"log" "log"
"time"
_ "github.com/jackc/pgx/v4/stdlib" _ "github.com/jackc/pgx/v4/stdlib"
"golang.yandex/hasql" "golang.yandex/hasql"
@ -24,7 +27,7 @@ func Open() {
log.Fatal(err) log.Fatal(err)
} }
log.Println("Node address", node.Addr) log.Println("Node address", node.Addr())
ctx, cancel := context.WithTimeout(context.Background(), time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Second)
defer cancel() defer cancel()

View file

@ -1,6 +1,7 @@
package redis package redis
import ( import (
"context"
"log" "log"
"time" "time"

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package lrucache package lrucache

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package lrucache package lrucache

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package once package once

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package otp package otp

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package pubsub package pubsub

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package pubsub package pubsub

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package ratelimit package ratelimit

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package kvapi package kvapi

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package kvapi package kvapi

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package retryupdate package retryupdate

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package reversemap package reversemap

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package rwmutex package rwmutex

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package speller package speller

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package structtags package structtags

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package sum package sum

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package tabletest package tabletest

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package tabletest package tabletest

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package testequal package testequal

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package testequal package testequal

View file

@ -1,4 +1,3 @@
//go:build !solution //go:build !solution
// +build !solution
package testifycheck package testifycheck

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package testtool package testtool

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package tparallel package tparallel

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package reverse package reverse

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package spacecollapse package spacecollapse

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package varfmt package varfmt

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package varjoin package varjoin

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package waitgroup package waitgroup

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main

View file

@ -1,5 +1,4 @@
//go:build !change //go:build !change
// +build !change
package main package main

View file

@ -1,5 +1,4 @@
//go:build !solution //go:build !solution
// +build !solution
package main package main