Hallo Heiko, 2014/1/12 Heiko Baumann <h...@gmx.de>
> Hm. Ich hab vorhin mit git pull meinen vz geupdatet: > > pi@BauratPi /var/www/volkszaehler.org $ sudo git pull > remote: Counting objects: 73, done. > remote: Compressing objects: 100% (70/70), done. > remote: Total 73 (delta 29), reused 34 (delta 3) > Unpacking objects: 100% (73/73), done. > From git://github.com/volkszaehler/volkszaehler.org > ec0c82d..ba113f6 master -> origin/master > Updating ec0c82d..ba113f6 > Fast-forward > .../Interpreter/CounterInterpreter.php | 27 ++---- > lib/Volkszaehler/Interpreter/MeterInterpreter.php | 3 +- > .../Interpreter/SQL/MySQLAggregateOptimizer.php | 90 > +++++++++++--------- > lib/Volkszaehler/Interpreter/SQL/SQLOptimizer.php | 3 +- > lib/Volkszaehler/Interpreter/SensorInterpreter.php | 3 +- > lib/Volkszaehler/Model/Property.php | 13 ++- > lib/Volkszaehler/View/CSV.php | 52 +++-------- > lib/Volkszaehler/View/JSON.php | 32 ++----- > lib/Volkszaehler/View/JpGraph.php | 8 +- > lib/Volkszaehler/View/XML.php | 80 > ++++++----------- > misc/tools/vzclient | 16 ++-- > test/Tests/DataCounterTest.php | 2 +- > test/Tests/DataMeterTest.php | 2 +- > 13 files changed, 135 insertions(+), 196 deletions(-) > > - damit sollten doch alle updates drin sein, oder? > Ja- Commit 8ac2c5039273b590aec2a9890f87400c08b949a8 liegt dazwischen. > > Im mysql-log gehts aber nach wie vor extrem wüst zu: > 17345 Connect vz@localhost on volkszaehler > 17345 Query SELECT e0_.id AS id0, e0_.uuid AS uuid1, > e0_.type AS type2, p1_.id AS id3, p1_.pkey AS pkey4, p1_.value AS value5, > e0_.class AS class6, p1_.entity_id AS entity_id7 FROM entities e0_ LEFT > JOIN properties p1_ ON e0_.id = p1_.entity_id WHERE (e0_.uuid = > 'ae9d1b00-f2f5-11e2-8a1f-0dad1c039958') AND e0_.class IN ('channel', > 'aggregator') ORDER BY p1_.pkey ASC > 140112 22:33:47 17345 Query START TRANSACTION > 17345 Query INSERT INTO data (timestamp, value, > channel_id) VALUES ('1389562426842', '1', 16) > 17345 Query UPDATE properties SET value = '1' WHERE id > = 83 > 17345 Query UPDATE properties SET value = '1' WHERE id > = 81 > 17345 Query UPDATE properties SET value = '3600000' > WHERE id = 79 > 17345 Query commit > 17345 Quit > > Insofern also alles beim alten. Wie krieg ich die neueste Version? > Ich kann's nicht mehr nachvollziehen: SELECT e0_.id AS id0, e0_.uuid AS uuid1, e0_.type AS type2, p1_.id AS id3, p1_.pkey AS pkey4, p1_.value AS value5, e0_.class AS class6, p1_.entity_id AS entity_id7 FROM entities e0_ LEFT JOIN properties p1_ ON e0_.id = p1_.entity_id WHERE (e0_.uuid = ?) AND e0_.class IN ('channel', 'aggregator') ORDER BY p1_.pkey ASC START TRANSACTION INSERT INTO data (timestamp, value, channel_id) VALUES (?, ?, ?) COMMIT Bist Du sicher dass der Code den Du siehst auch wirklich der ist der ausgeführt wird? vg Andreas