From 0fab00a2ff4fbe7c3c56b7bd2dc523eb974aba61 Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Sat, 20 Apr 2013 22:26:55 +0200 Subject: sachen rumgeschoben, leveldb: 32bit fix --- ebus-datastore/testfiles/bsdtest.py | 49 ------------------------ ebus-datastore/testfiles/bsdtest_query.py | 22 ----------- ebus-datastore/testfiles/datastore-test.py | 21 ---------- ebus-datastore/testfiles/importtest.py | 61 ------------------------------ ebus-datastore/testfiles/test.py | 14 ------- 5 files changed, 167 deletions(-) delete mode 100644 ebus-datastore/testfiles/bsdtest.py delete mode 100644 ebus-datastore/testfiles/bsdtest_query.py delete mode 100644 ebus-datastore/testfiles/datastore-test.py delete mode 100644 ebus-datastore/testfiles/importtest.py delete mode 100644 ebus-datastore/testfiles/test.py (limited to 'ebus-datastore/testfiles') diff --git a/ebus-datastore/testfiles/bsdtest.py b/ebus-datastore/testfiles/bsdtest.py deleted file mode 100644 index b6587d0..0000000 --- a/ebus-datastore/testfiles/bsdtest.py +++ /dev/null @@ -1,49 +0,0 @@ -import bsddb -import psycopg2 -from subprocess import Popen,PIPE -import time -import sys - -db = bsddb.btopen("test.btdbm") - -conn = psycopg2.connect("dbname=ebus user=ebus") -cur = conn.cursor() -sql = """SELECT * from sensor""" -cur.execute(sql) -sensors = cur.fetchall() -sensors = map(lambda a: (a[0], a[1]), sensors) -sensors = dict(sensors) -cur.close() -conn.close() - -pg_dump = Popen(["psql","-A","-t"], stdin=PIPE, stdout=PIPE) -pg_dump.stdin.write("COPY value TO stdout WITH DELIMITER '|' NULL AS '';\n") -pg_dump.stdin.close() - -c=0 -try: - while not pg_dump.stdout.closed: - line = pg_dump.stdout.readline() - c += 1 - if line == "": - continue - (oid, s_timestamp, sensor_id, type, value_float, value_int, value_string) = line.split("|") - name = sensors[int(sensor_id)] - timestamp = time.strptime(s_timestamp.split(".")[0], "%Y-%m-%d %H:%M:%S") - timestamp = time.mktime(timestamp) - if type == "int": - value= value_int - elif type == "float": - value = value_float - else: - continue - - db["%s:%d"%(name,timestamp)] = value - if c%10000==0: - print "%d: %s:%s=%s"%(c,name,s_timestamp,value) -except KeyboardInterrupt: - db.close() - -print "done" - - diff --git a/ebus-datastore/testfiles/bsdtest_query.py b/ebus-datastore/testfiles/bsdtest_query.py deleted file mode 100644 index 39bd3f1..0000000 --- a/ebus-datastore/testfiles/bsdtest_query.py +++ /dev/null @@ -1,22 +0,0 @@ -import bsddb -import psycopg2 -from subprocess import Popen,PIPE -import time -import sys -import numpy as np - -db = bsddb.btopen("test.btdbm","r") - -c=0 -a=[] -print db.set_location("heizkreisregler10.betriebsdatenRegler1.kesselTemperatur") -while c<50000: - k,v = db.next() - a.append(float(v)) - c+=1 - -print "count=", len(a) -print "avg=", np.average(a) -print "done" - - diff --git a/ebus-datastore/testfiles/datastore-test.py b/ebus-datastore/testfiles/datastore-test.py deleted file mode 100644 index 8fd6847..0000000 --- a/ebus-datastore/testfiles/datastore-test.py +++ /dev/null @@ -1,21 +0,0 @@ -import time -import struct -from ebus.datastore import Datastore - -d = Datastore("datastore-data", readonly=True) - -""" -config = d.get_config("heizkreisregler1.datumZeit.minuten") -for (key, value) in d.get_range("heizkreisregler1.datumZeit.minuten", - 1321056000000, - 1325100000000): - print time.strftime("%F %H:%M:%S", time.gmtime(key/1000)), \ - struct.unpack(config['format'].encode('latin-1'), value) -""" - -data = d.get_range_n("heizkreisregler1.datumZeit.minuten", - 1321056000000, 1325100000000,number=100) -print len(list(data)) - -d.close() - diff --git a/ebus-datastore/testfiles/importtest.py b/ebus-datastore/testfiles/importtest.py deleted file mode 100644 index 68cb989..0000000 --- a/ebus-datastore/testfiles/importtest.py +++ /dev/null @@ -1,61 +0,0 @@ -# -*- coding: utf-8 -*- -import sys -import time -import psycopg2 -from datastore import Datastore -from subprocess import Popen,PIPE - -conn = psycopg2.connect("dbname=ebus user=ebus") -cur = conn.cursor() -sql = """SELECT * from sensor""" -cur.execute(sql) -sensors = cur.fetchall() -sensors = map(lambda a: (a[0], a[1]), sensors) -sensors = dict(sensors) -cur.close() -conn.close() - -d = Datastore("datastore-data") - -pg_dump = Popen(["psql","-A","-t"], stdin=PIPE, stdout=PIPE) -pg_dump.stdin.write("COPY value TO stdout WITH DELIMITER '|' NULL AS '';\n") -#pg_dump.stdin.write("SELECT * FROM value WHERE timestamp > current_timestamp - interval '30 days';\n\\q\\n") -pg_dump.stdin.close() - - -c=0 -while not pg_dump.stdout.closed: - line = pg_dump.stdout.readline() - c += 1 - if line == "": break - (oid, timestamp, sensor_id, type, value_float, value_int, value_string) = line.split("|") - name = sensors[int(sensor_id)] - - """ if not name in ("heizkreisregler9.solarDaten.tempKollektor", - "heizkreisregler10.betriebsdatenRegler1.kesselTemperatur", - "heizkreisregler9.solarDaten.tempWarmwasserSolar", - "feuerungsautomat1.betriebsdatenRegler1.aussenTemperatur", - "heizkreisregler10.betriebsdatenRegler1.boilerTemperatur"): - continue """ - - if c % 10000 == 0: print timestamp - - timestamp = time.strptime(timestamp.split(".")[0], "%Y-%m-%d %H:%M:%S") - timestamp = time.mktime(timestamp) - timestamp = timestamp * 1000 - timestamp = int(timestamp) - - if type == "int": - d.addValueInt(name, timestamp, int(value_int)) - elif type == "float": - d.addValueFloat(name, timestamp, float(value_float)) - elif type == "string": - d.addValueString(name, timestamp, value_string) - else: - print "invalid type %s" % type - # print "{name} {type} {timestamp} {value}".format(name=name, type=type, timestamp=timestamp, value=value) - - -d.close() - -# vim: autoindent tabstop=4 shiftwidth=4 expandtab softtabstop=4 filetype=python diff --git a/ebus-datastore/testfiles/test.py b/ebus-datastore/testfiles/test.py deleted file mode 100644 index 506439c..0000000 --- a/ebus-datastore/testfiles/test.py +++ /dev/null @@ -1,14 +0,0 @@ -import time -import ebus.datastore - -d = ebus.datastore.Datastore("datastore-data",readonly=True) - -start = long(time.time()-60*60*5)*1000 -end = long(time.time())*1000 -start = 1364030373029 -end = 1364116773029 -data = d.get_range_n("heizkreisregler9.solarDaten.tempKollektor", - start, - end, - 200) -print len(list(data)) -- cgit v1.2.1