Merge lp:~stewart/percona-server/5.5-remove-lrusort into lp:percona-server/5.5

Proposed by Stewart Smith
Status: Merged
Approved by: Alexey Kopytov
Approved revision: no longer in the source branch.
Merged at revision: 283
Proposed branch: lp:~stewart/percona-server/5.5-remove-lrusort
Merge into: lp:percona-server/5.5
Diff against target: 65 lines (+1/-43)
2 files modified
Makefile (+1/-5)
lrusort.py (+0/-38)
To merge this branch: bzr merge lp:~stewart/percona-server/5.5-remove-lrusort
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Review via email: mp+110472@code.launchpad.net

Description of the change

remove the no longer needed script

To post a comment you must log in.
Revision history for this message
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2012-06-02 00:51:50 +0000
+++ Makefile 2012-06-15 06:22:29 +0000
@@ -22,7 +22,7 @@
22REVS = $(shell bzr log | grep rev | head -1 )22REVS = $(shell bzr log | grep rev | head -1 )
23REV = $(word 2, $(REVS) )23REV = $(word 2, $(REVS) )
2424
25all: main handlersocket maatkit-udf install-lic misc25all: main handlersocket maatkit-udf install-lic
26 @echo ""26 @echo ""
27 @echo "Percona Server source code is ready"27 @echo "Percona Server source code is ready"
28 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"28 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
@@ -76,9 +76,5 @@
7676
77main: prepare77main: prepare
7878
79misc:
80 @echo "Installing other files"
81 install -m 644 lrusort.py $(PERCONA_SERVER)/scripts
82
83clean:79clean:
84 rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1) $(RELEASE_DIR) $(DEBUG_DIR)80 rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1) $(RELEASE_DIR) $(DEBUG_DIR)
8581
=== removed file 'lrusort.py'
--- lrusort.py 2010-12-09 20:46:27 +0000
+++ lrusort.py 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
1import struct
2import sys
3
4# bytes per single LRU entry
5blocksize=8
6
7flru = open(sys.argv[1], 'rb')
8
9L = []
10
11while True:
12 s1 = flru.read(blocksize)
13 if s1=="":
14 break;
15 # InnoDB uses big-endian format for storage
16 val = struct.unpack('>II', s1)
17 if (val[0]>0) or (val[1]>0):
18 L.append(val)
19
20print "Length:", len(L)
21L.sort()
22
23flru.close()
24
25fsorted = open(sys.argv[1], 'wb')
26for item in L:
27 # InnoDB uses big-endian format for storage
28 pk=struct.pack('>II', item[0],item[1])
29 fsorted.write(pk)
30
31pk=struct.pack('>II',0,0);
32
33for i in range(0, 16*1024 / 8):
34 fsorted.write(pk)
35
36fsorted.close()
37
38print "Done!"

Subscribers

People subscribed via source and target branches