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
1=== modified file 'Makefile'
2--- Makefile 2012-06-02 00:51:50 +0000
3+++ Makefile 2012-06-15 06:22:29 +0000
4@@ -22,7 +22,7 @@
5 REVS = $(shell bzr log | grep rev | head -1 )
6 REV = $(word 2, $(REVS) )
7
8-all: main handlersocket maatkit-udf install-lic misc
9+all: main handlersocket maatkit-udf install-lic
10 @echo ""
11 @echo "Percona Server source code is ready"
12 @echo "Now change directory to $(PERCONA_SERVER) define variables as show below"
13@@ -76,9 +76,5 @@
14
15 main: prepare
16
17-misc:
18- @echo "Installing other files"
19- install -m 644 lrusort.py $(PERCONA_SERVER)/scripts
20-
21 clean:
22 rm -rf mysql-$(MYSQL_VERSION) $(PERCONA_SERVER) $(PERCONA_SERVER_SHORT_1) $(RELEASE_DIR) $(DEBUG_DIR)
23
24=== removed file 'lrusort.py'
25--- lrusort.py 2010-12-09 20:46:27 +0000
26+++ lrusort.py 1970-01-01 00:00:00 +0000
27@@ -1,38 +0,0 @@
28-import struct
29-import sys
30-
31-# bytes per single LRU entry
32-blocksize=8
33-
34-flru = open(sys.argv[1], 'rb')
35-
36-L = []
37-
38-while True:
39- s1 = flru.read(blocksize)
40- if s1=="":
41- break;
42- # InnoDB uses big-endian format for storage
43- val = struct.unpack('>II', s1)
44- if (val[0]>0) or (val[1]>0):
45- L.append(val)
46-
47-print "Length:", len(L)
48-L.sort()
49-
50-flru.close()
51-
52-fsorted = open(sys.argv[1], 'wb')
53-for item in L:
54- # InnoDB uses big-endian format for storage
55- pk=struct.pack('>II', item[0],item[1])
56- fsorted.write(pk)
57-
58-pk=struct.pack('>II',0,0);
59-
60-for i in range(0, 16*1024 / 8):
61- fsorted.write(pk)
62-
63-fsorted.close()
64-
65-print "Done!"

Subscribers

People subscribed via source and target branches