remove support for older versions of ClickHouse

Author: kshvakov

clickhouse_progress.go

@@ -1,7 +1,5 @@
 package clickhouse
 
-import "github.com/kshvakov/clickhouse/lib/protocol"
-
 type progress struct {
 	rows      uint64
 	bytes     uint64
@@ -19,10 +17,10 @@ func (ch *clickhouse) progress() (*progress, error) {
 	if p.bytes, err = ch.decoder.Uvarint(); err != nil {
 		return nil, err
 	}
-	if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_TOTAL_ROWS_IN_PROGRESS {
-		if p.totalRows, err = ch.decoder.Uvarint(); err != nil {
-			return nil, err
-		}
+
+	if p.totalRows, err = ch.decoder.Uvarint(); err != nil {
+		return nil, err
 	}
+
 	return &p, nil
 }

clickhouse_read_block.go

@@ -4,19 +4,18 @@ import (
 	"time"
 
 	"github.com/kshvakov/clickhouse/lib/data"
-	"github.com/kshvakov/clickhouse/lib/protocol"
 )
 
 func (ch *clickhouse) readBlock() (*data.Block, error) {
 	{
 		ch.conn.SetReadDeadline(time.Now().Add(ch.readTimeout))
 		ch.conn.SetWriteDeadline(time.Now().Add(ch.writeTimeout))
 	}
-	if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_TEMPORARY_TABLES {
-		if _, err := ch.decoder.String(); err != nil {
-			return nil, err
-		}
+
+	if _, err := ch.decoder.String(); err != nil { // temporary table
+		return nil, err
 	}
+
 	if ch.compress {
 
 	}

clickhouse_send_query.go

@@ -19,21 +19,21 @@ func (ch *clickhouse) sendQuery(query string) error {
 	if err := ch.encoder.String(""); err != nil {
 		return err
 	}
-	if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_CLIENT_INFO {
-		ch.encoder.Uvarint(1)
+
+	ch.encoder.Uvarint(1)
+	ch.encoder.String("")
+	ch.encoder.String("") //initial_query_id
+	ch.encoder.String("[::ffff:127.0.0.1]:0")
+	ch.encoder.Uvarint(1) // iface type TCP
+	ch.encoder.String(hostname)
+	ch.encoder.String(hostname)
+	if err := ch.ClientInfo.Write(ch.encoder); err != nil {
+		return err
+	}
+	if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO {
 		ch.encoder.String("")
-		ch.encoder.String("") //initial_query_id
-		ch.encoder.String("[::ffff:127.0.0.1]:0")
-		ch.encoder.Uvarint(1) // iface type TCP
-		ch.encoder.String(hostname)
-		ch.encoder.String(hostname)
-		if err := ch.ClientInfo.Write(ch.encoder); err != nil {
-			return err
-		}
-		if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO {
-			ch.encoder.String("")
-		}
 	}
+
 	if err := ch.encoder.String(""); err != nil { // settings
 		return err
 	}

clickhouse_write_block.go

@@ -17,11 +17,11 @@ func (ch *clickhouse) writeBlock(block *data.Block) error {
 	if err := ch.encoder.Uvarint(protocol.ClientData); err != nil {
 		return err
 	}
-	if ch.ServerInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_TEMPORARY_TABLES {
-		if err := ch.encoder.String(""); err != nil {
-			return err
-		}
+
+	if err := ch.encoder.String(""); err != nil { // temporary table
+		return err
 	}
+
 	// @todo: implement CityHash v 1.0.2 and add LZ4 compression
 	if ch.compress {
 		/*

lib/data/block.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/kshvakov/clickhouse/lib/binary"
 	"github.com/kshvakov/clickhouse/lib/column"
-	"github.com/kshvakov/clickhouse/lib/protocol"
 	wb "github.com/kshvakov/clickhouse/lib/writebuffer"
 )
 
@@ -39,11 +38,10 @@ func (block *Block) ColumnNames() []string {
 }
 
 func (block *Block) Read(serverInfo *ServerInfo, decoder *binary.Decoder) (err error) {
-	if serverInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_BLOCK_INFO {
-		if err = block.info.read(decoder); err != nil {
-			return err
-		}
+	if err = block.info.read(decoder); err != nil {
+		return err
 	}
+
 	if block.NumColumns, err = decoder.Uvarint(); err != nil {
 		return err
 	}
@@ -163,11 +161,10 @@ func (block *Block) Reset() {
 }
 
 func (block *Block) Write(serverInfo *ServerInfo, encoder *binary.Encoder) error {
-	if serverInfo.Revision >= protocol.DBMS_MIN_REVISION_WITH_BLOCK_INFO {
-		if err := block.info.write(encoder); err != nil {
-			return err
-		}
+	if err := block.info.write(encoder); err != nil {
+		return err
 	}
+
 	encoder.Uvarint(block.NumColumns)
 	encoder.Uvarint(block.NumRows)
 	block.NumRows = 0

lib/protocol/protocol.go

@@ -1,10 +1,6 @@
 package protocol
 
 const (
-	DBMS_MIN_REVISION_WITH_TEMPORARY_TABLES         = 50264
-	DBMS_MIN_REVISION_WITH_TOTAL_ROWS_IN_PROGRESS   = 51554
-	DBMS_MIN_REVISION_WITH_BLOCK_INFO               = 51903
-	DBMS_MIN_REVISION_WITH_CLIENT_INFO              = 54032
 	DBMS_MIN_REVISION_WITH_SERVER_TIMEZONE          = 54058
 	DBMS_MIN_REVISION_WITH_QUOTA_KEY_IN_CLIENT_INFO = 54060
 )
@@ -17,8 +13,6 @@ const (
 	ClientPing   = 4
 )
 
-const Query = 1
-
 const (
 	CompressEnable  uint64 = 1
 	CompressDisable uint64 = 0